From: Date: August 7 2008 3:40am
Subject: bzr commit into mysql-6.0-backup branch (hezx:2696) Bug#37051
List-Archive: http://lists.mysql.com/commits/51064
X-Bug: 37051
Message-Id: <200808070140.m771eg0E008952@mail.hezx.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///media/sda3/work/mysql/bzrwork/b37051/6.0-rpl/

 2696 He Zhenxing	2008-08-07
      Merge post-fix of BUG#37051
modified:
  mysql-test/r/multi_update.result
  sql/sql_class.cc

=== modified file 'mysql-test/r/multi_update.result'
--- a/mysql-test/r/multi_update.result	2008-06-10 22:27:52 +0000
+++ b/mysql-test/r/multi_update.result	2008-08-07 01:40:24 +0000
@@ -627,7 +627,7 @@ a	b
 4	4
 show master status /* there must be the UPDATE query event */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	198		
+master-bin.000001	207		
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -637,7 +637,7 @@ UPDATE t2,t1  SET t2.a=t2.b where t2.a=t
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
 show master status /* there must be the UPDATE query event */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	213		
+master-bin.000001	222		
 drop table t1, t2;
 set @@session.binlog_format= @sav_binlog_format;
 drop table if exists t1, t2, t3;

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-08-06 08:13:57 +0000
+++ b/sql/sql_class.cc	2008-08-07 01:40:24 +0000
@@ -513,6 +513,7 @@ THD::THD()
    lock_id(&main_lock_id),
    user_time(0), in_sub_stmt(0),
    binlog_table_maps(0), binlog_flags(0UL),
+   table_map_for_update(0),
    arg_of_last_insert_id_function(FALSE),
    first_successful_insert_id_in_prev_stmt(0),
    first_successful_insert_id_in_prev_stmt_for_binlog(0),