*** ./mysql-test/r/multi_update.result	Wed Mar 14 11:05:39 2007
--- ../mysql-5.0.bk/./mysql-test/r/multi_update.result	Thu Mar 15 13:38:35 2007
***************
*** 426,434 ****
  a
  2
  DROP TABLE t1,t2;
  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;
--- 426,434 ----
  a
  2
  DROP TABLE t1,t2;
  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 NOT 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;
*** ./mysql-test/t/multi_update.test	Wed Mar 14 11:05:36 2007
--- ../mysql-5.0.bk/./mysql-test/t/multi_update.test	Thu Mar 15 13:38:14 2007
***************
*** 381,389 ****
  #
  # 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_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; 
--- 381,389 ----
  #
  # 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_active` tinyint(1) unsigned NOT NULL default '1', PRIMARY KEY (`p_id`) );
! create table `t2` (`c2_id` int(10) unsigned NOT 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;