From: Date: March 30 2006 4:46pm Subject: bk commit into 5.0 tree (aelkin:1.2122) BUG#17284 List-Archive: http://lists.mysql.com/commits/4324 X-Bug: 17284 Message-Id: <200603301446.k2UEkSxS028814@dsl-hkigw8-feb0de00-199.dhcp.inet.fi> Below is the list of changes that have just been committed into a local 5.0 repository of elkin. When elkin 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.2122 06/03/30 17:46:22 aelkin@stripped +2 -0 Bug#17284 erroneous temp table cleanup on slave. BitKeeper/etc/ignore 1.219 06/03/30 17:46:17 aelkin@stripped +1 -0 Added sql/the_bug.txt to the ignore list sql/sql_repl.cc 1.148 06/03/30 17:46:16 aelkin@stripped +6 -0 Storing zero for assigning to `created' of FD event on the slave. # 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: aelkin # Host: dsl-hkigw8-feb0de00-199.dhcp.inet.fi # Root: /usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug17284-temp_table --- 1.218/BitKeeper/etc/ignore 2006-03-28 05:25:30 +03:00 +++ 1.219/BitKeeper/etc/ignore 2006-03-30 17:46:17 +03:00 @@ -1278,3 +1278,4 @@ mysql-test/r/bdb.log mysql-test/r/im_client_port.log mysql-test/r/udf.log +sql/the_bug.txt --- 1.147/sql/sql_repl.cc 2006-01-03 18:54:37 +02:00 +++ 1.148/sql/sql_repl.cc 2006-03-30 17:46:16 +03:00 @@ -466,6 +466,12 @@ (rli->group_master_log_pos) */ int4store((char*) packet->ptr()+LOG_POS_OFFSET+1, 0); + /* + if reconnect master sends FD event with `created' as 0 + to avoid destroying temp tables. + */ + int4store((char*) packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+ + ST_CREATED_OFFSET+1, (ulong) 0); /* send it */ if (my_net_write(net, (char*)packet->ptr(), packet->length())) {