diff options
| author | unknown <monty@mysql.com> | 2004-03-16 02:59:39 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-16 02:59:39 +0200 |
| commit | 5a9910e228bbe380a25aeda7bebea5063c12d648 (patch) | |
| tree | 61f1cdfa1fd7e1a5d6d8c6925730b71cec1f2e9d | |
| parent | 4f27d6eb3fc8818e95c46399ac346d6afe8bb478 (diff) | |
| download | mariadb-git-5a9910e228bbe380a25aeda7bebea5063c12d648.tar.gz | |
Remove not needed patch
| -rw-r--r-- | mysql-test/r/multi_update.result | 20 | ||||
| -rw-r--r-- | mysql-test/t/multi_update.test | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index dd020aaf18c..12cb965f045 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -386,17 +386,17 @@ SELECT * from t2; a 1 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',"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); +create table `t1` (`p_id` int(10) unsigned NOT NULL auto_increment, `p_code` varchar(20) NOT NULL default '', `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_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',1); +insert into t1 values (0,'B01-Comp',1); +insert into t2 values (0,1,'A Note',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-01-05 12:12:12 1 -2 B01-Comp 2004-01-05 12:12:13 1 +p_id p_code p_active +1 A01-Comp 1 +2 B01-Comp 1 select * from t2; -c2_id c2_p_id c2_note c2_created c2_active -1 1 A Note 2004-01-05 12:12:14 1 +c2_id c2_p_id c2_note c2_active +1 1 A Note 1 drop table t1, t2; diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index e4651df400f..39ea136bde1 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -330,11 +330,11 @@ DROP TABLE t1,t2; # Test update with const tables # -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',"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); +create table `t1` (`p_id` int(10) unsigned NOT NULL auto_increment, `p_code` varchar(20) NOT NULL default '', `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_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',1); +insert into t1 values (0,'B01-Comp',1); +insert into t2 values (0,1,'A Note',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; |