diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-03-13 21:06:36 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-03-13 21:06:36 +0200 |
| commit | 05b1020397c3aea694f9839a3c4f196d7260d721 (patch) | |
| tree | 007083ed15f9c12a2356f6ee503aa711fe34927d | |
| parent | e6f59dd60e76f2dcb76a7faccc016d8e9590b9fe (diff) | |
| download | mariadb-git-05b1020397c3aea694f9839a3c4f196d7260d721.tar.gz | |
multi_update.result:
Fix for a bug in the result
multi_update.test:
Fix for a bug in the test
mysql-test/t/multi_update.test:
Fix for a bug in the test
mysql-test/r/multi_update.result:
Fix for a bug in the result
| -rw-r--r-- | mysql-test/r/multi_update.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/multi_update.test | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index df24a1cfd58..dd020aaf18c 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -388,15 +388,15 @@ a DROP TABLE t1,t2; create table `t1` ( `p_id` int(10) unsigned NOT NULL auto_increment, `p_code` varchar(20) NOT NULL default '', `p_created` datetime NOT NULL default '0000-00-00 00:00:00', `p_active` tinyint(1) unsigned NOT NULL default '1', PRIMARY KEY (`p_id`) ); create table `t2` ( `c2_id` int(10) unsigned NULL auto_increment, `c2_p_id` int(10) unsigned NOT NULL default '0', `c2_note` text NOT NULL, `c2_created` datetime NOT NULL default '0000-00-00 00:00:00', `c2_active` tinyint(1) unsigned NOT NULL default '1', PRIMARY KEY (`c2_id`), KEY `c2_p_id` (`c2_p_id`) ); -insert into t1 values (0,'A01-Comp',now(),1); -insert into t1 values (0,'B01-Comp',now(),1); -insert into t2 values (0,1,'A Note',now(),1); +insert into t1 values (0,'A01-Comp',"2004-01-05 12:12:12",1); +insert into t1 values (0,'B01-Comp',"2004-01-05 12:12:13",1); +insert into t2 values (0,1,'A Note',"2004-01-05 12:12:14",1); update t1 left join t2 on p_id = c2_p_id set c2_note = 'asdf-1' where p_id = 2; select * from t1; p_id p_code p_created p_active -1 A01-Comp 2004-03-11 23:21:29 1 -2 B01-Comp 2004-03-11 23:21:29 1 +1 A01-Comp 2004-01-05 12:12:12 1 +2 B01-Comp 2004-01-05 12:12:13 1 select * from t2; c2_id c2_p_id c2_note c2_created c2_active -1 1 A Note 2004-03-11 23:21:29 1 +1 1 A Note 2004-01-05 12:12:14 1 drop table t1, t2; diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 6ed340ad92b..e4651df400f 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -332,9 +332,9 @@ DROP TABLE t1,t2; create table `t1` ( `p_id` int(10) unsigned NOT NULL auto_increment, `p_code` varchar(20) NOT NULL default '', `p_created` datetime NOT NULL default '0000-00-00 00:00:00', `p_active` tinyint(1) unsigned NOT NULL default '1', PRIMARY KEY (`p_id`) ); create table `t2` ( `c2_id` int(10) unsigned NULL auto_increment, `c2_p_id` int(10) unsigned NOT NULL default '0', `c2_note` text NOT NULL, `c2_created` datetime NOT NULL default '0000-00-00 00:00:00', `c2_active` tinyint(1) unsigned NOT NULL default '1', PRIMARY KEY (`c2_id`), KEY `c2_p_id` (`c2_p_id`) ); -insert into t1 values (0,'A01-Comp',now(),1); -insert into t1 values (0,'B01-Comp',now(),1); -insert into t2 values (0,1,'A Note',now(),1); +insert into t1 values (0,'A01-Comp',"2004-01-05 12:12:12",1); +insert into t1 values (0,'B01-Comp',"2004-01-05 12:12:13",1); +insert into t2 values (0,1,'A Note',"2004-01-05 12:12:14",1); update t1 left join t2 on p_id = c2_p_id set c2_note = 'asdf-1' where p_id = 2; select * from t1; select * from t2; |