bk commit into 4.0 tree (Sinisa:1.1747)

[sinisa]

Below is the list of changes that have just been committed into a local
4.0 repository of Sinisa. When Sinisa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1747 04/03/13 21:06:36 Sinisa@stripped +2 -0
  multi_update.result:
    Fix for a bug in the result
  multi_update.test:
    Fix for a bug in the test

  mysql-test/r/multi_update.result
    1.31 04/03/13 21:06:05 Sinisa@stripped +6 -6
    Fix for a bug in the result

  mysql-test/t/multi_update.test
    1.33 04/03/13 21:05:45 Sinisa@stripped +3 -3
    Fix for a bug in the test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.0

--- 1.30/mysql-test/r/multi_update.result	Thu Mar 11 22:25:35 2004
+++ 1.31/mysql-test/r/multi_update.result	Sat Mar 13 21:06:05 2004
@@ -388,15 +388,15 @@
 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;

--- 1.32/mysql-test/t/multi_update.test	Thu Mar 11 22:25:11 2004
+++ 1.33/mysql-test/t/multi_update.test	Sat Mar 13 21:05:45 2004
@@ -332,9 +332,9 @@
 
 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;