Merge lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949 into lp:ubuntu/lucid-updates/mysql-dfsg-5.1

[Clint Byrum]

[lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949]

34. By Clint Byrum on 2010-09-09

Adding patch

[Clint Byrum (clint-fewbar)]

Please note that the initial diff was missing the patch file. I just pushed it up.

[Dave Walker (davewalker)]

Is this merge proposal still needed?

Thanks

[Clint Byrum (clint-fewbar)]

Yes! This needs to be uploaded to lucid-proposed.

[lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949]

35. By Clint Byrum on 2010-12-03

merging with latest archive changes and adding DEP3 headers to patch

[Daniel Holbach (dholbach)]

A few smaller things:
 - debian/changelog has no explanation what the patch is about
 - the changelog entry of 4.0.20-8 is removed, the entry of 3.21.21.beta-1 is moved?
 - there's a merge conflict in debian/changelog too

Something like this maybe:

=== modified file 'debian/changelog'
--- debian/changelog 2010-11-20 12:06:00 +0000
+++ debian/changelog 2010-12-21 09:05:57 +0000
@@ -1,3 +1,11 @@
+mysql-dfsg-5.1 (5.1.41-3ubuntu12.9) lucid-proposed; urgency=low
+
+ * debian/patches/cherrypick-upstream-49479.dpatch: upstream patch to fix
+ "LOAD DATA INFILE fails in replication when there are keywords or braces
+ in columnnames" (LP: #576949)
+
+ -- Clint Byrum <email address hidden> Mon, 22 Nov 2010 06:14:16 -0800
+
 mysql-dfsg-5.1 (5.1.41-3ubuntu12.8) lucid-proposed; urgency=low

   * raising kill timeout to 300 to help avoid table corruption (LP: #620441)

review: Needs Fixing

[Daniel Holbach (dholbach)]

FTBFS:

rpl.rpl_circular_for_4_hosts [ pass ] 3957
rpl.rpl_circular_for_4_hosts 'innodb_plugin' [ pass ] 3544
binlog.binlog_sql_mode [ pass ] 257
rpl.rpl_000015 [ pass ] 142
rpl.rpl_rotate_logs [ pass ] 826
------------------------------------------------------------
The servers were restarted 436 times
Spent 1256.079 of 3392 seconds executing testcases

Failed 1/752 tests, 99.87% were successful.

Failing test(s): main.events_bugs

The log files in var/log may give you some hint of what went wrong.

If you want to report this error, please read first the documentation
at http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html

mysql-test-run: *** ERROR: there were failing test cases
make[2]: *** [test-ns] Error 1
make[2]: Leaving directory `/tmp/buildd/mysql-dfsg-5.1-5.1.41/builddir'
make[1]: *** [test-force] Error 2
make[1]: Leaving directory `/tmp/buildd/mysql-dfsg-5.1-5.1.41/builddir'
make: *** [build-stamp] Error 1
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env

review: Needs Fixing

[Martin Pitt (pitti)]

Also, why does this remove the 4.0.20-8 changelog and move the other around?

[Clint Byrum (clint-fewbar)]

I believe the changelog weirdness was caused by using merge-changelog, as the versions are not in proper order. I will revert that. I also think that the FTBFS that dholbach experienced was a transient failure, as this does not fail for me. I'm doing a test rebuild with the latest lucid updates to make sure. Will push again shortly.

[lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949]

36. By Clint Byrum on 2011-02-01

restoring mangled changelog entries

37. By Clint Byrum on 2011-02-01

merging with latest lucid-proposed changes

38. By Clint Byrum on 2011-02-01

fixing changelog and patch name

[Clint Byrum (clint-fewbar)]

Ok, I have pushed up a version which fixes the changelog problems and builds successfully in a lucid chroot w/ sbuild.

[lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949]

39. By Clint Byrum on 2011-02-01

fix patch name in changelog

[Kees Cook (kees)]

This looks good; thanks for including updated test-cases too.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-28 23:38:54 +0000
+++ debian/changelog	2011-02-01 21:43:48 +0000
@@ -1,3 +1,10 @@
+mysql-dfsg-5.1 (5.1.41-3ubuntu12.10) lucid-proposed; urgency=low
+
+  * debian/patches/63_cherrypick-upstream-49479.dpatch: fixes LOAD DATA
+    INFILE when used in replication. (LP: #576949)
+
+ -- Clint Byrum <[e-mail]>  Mon, 22 Nov 2010 06:14:16 -0800
+
 mysql-dfsg-5.1 (5.1.41-3ubuntu12.9) lucid-proposed; urgency=low
 
   * added patch to fix a bug where certain ALTER TABLE queries would

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2010-12-28 23:38:54 +0000
+++ debian/patches/00list	2011-02-01 21:43:48 +0000
@@ -34,3 +34,4 @@
 60_CVE-2010-3840
 61_disable_longfilename_test
 62_alter_table_fix
+63_cherrypick-upstream-49479

=== added file 'debian/patches/63_cherrypick-upstream-49479.dpatch'
--- debian/patches/63_cherrypick-upstream-49479.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/63_cherrypick-upstream-49479.dpatch	2011-02-01 21:43:48 +0000
@@ -0,0 +1,323 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+#From: Clint Byrum <[e-mail]>
+#Description: Fixes LOAD DATA INFILE replication of tables needing escaping on their field naems
+#Bug: http://bugs.mysql.com/bug.php?id=49479
+#Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.1/+bug/576949 
+#Origin: http://lists.mysql.com/commits/92988 
+
+@DPATCH@
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-dfsg-5.1-5.1.41//mysql-test/extra/rpl_tests/rpl_loaddata.test
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/extra/rpl_tests/rpl_loaddata.test	2009-11-04 14:01:48.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/extra/rpl_tests/rpl_loaddata.test	2010-05-25 12:49:59.685032202 -0400
+@@ -219,4 +219,18 @@ source include/diff_tables.inc;
+ 
+ -- sync_slave_with_master
+ 
++# BUG#49479: LOAD DATA INFILE is binlogged without escaping field names
++-- source include/master-slave-reset.inc
++-- connection master
++use test;
++CREATE TABLE t1 (`key` TEXT, `text` TEXT);
++
++LOAD DATA INFILE '../../std_data/loaddata2.dat' REPLACE INTO TABLE `t1` FIELDS TERMINATED BY ',';
++SELECT * FROM t1;
++
++-- sync_slave_with_master
++-- connection master
++DROP TABLE t1;
++-- sync_slave_with_master
++
+ # End of 4.1 tests
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/r/mysqlbinlog.result mysql-dfsg-5.1-5.1.41//mysql-test/r/mysqlbinlog.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/r/mysqlbinlog.result	2009-11-04 14:01:20.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/r/mysqlbinlog.result	2010-05-25 12:49:59.685032202 -0400
+@@ -44,16 +44,16 @@ SET TIMESTAMP=1000000000/*!*/;
+ insert into t2 values ()
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ DELIMITER ;
+ # End of log file
+@@ -144,16 +144,16 @@ SET TIMESTAMP=1000000000/*!*/;
+ insert into t2 values ()
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`word`)
+ /*!*/;
+ DELIMITER ;
+ # End of log file
+@@ -359,29 +359,29 @@ SET @@session.collation_database=DEFAULT
+ create table t1 (a varchar(64) character set utf8)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+ SET @@session.collation_database=7/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+ SET @@session.collation_database=DEFAULT/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+ SET @@session.collation_database=7/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+ SET @@session.collation_database=DEFAULT/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a)
++LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)
+ /*!*/;
+ SET TIMESTAMP=1000000000/*!*/;
+ drop table t1
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_killed_simulate.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_killed_simulate.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_killed_simulate.result	2009-11-04 14:01:54.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_killed_simulate.result	2010-05-25 12:49:59.685032202 -0400
+@@ -19,7 +19,7 @@ ERROR 70100: Query execution was interru
+ show binlog events from <binlog_start>;
+ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+ master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+-master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a, b) ;file_id=#
++master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`) ;file_id=#
+ select
+ (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
+ is not null;
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2009-11-04 14:01:55.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2010-05-25 12:49:59.685032202 -0400
+@@ -929,7 +929,7 @@ master-bin.000001	#	User var	#	#	@`b`=_l
+ master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+ master-bin.000001	#	Intvar	#	#	INSERT_ID=10
+ master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
+-master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a, @b) SET b=((@b) + `bug27417`(2)) ;file_id=#
++master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @b) SET `b`=((@b) + `bug27417`(2)) ;file_id=#
+ master-bin.000001	#	Query	#	#	ROLLBACK
+ drop trigger trg_del_t2;
+ drop table t1,t2,t3,t4,t5;
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_stm_blackhole.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_stm_blackhole.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_stm_blackhole.result	2009-11-04 14:01:56.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_stm_blackhole.result	2010-05-25 12:49:59.685032202 -0400
+@@ -127,7 +127,7 @@ master-bin.000001	#	Query	#	#	COMMIT
+ master-bin.000001	#	Query	#	#	use `test`; create table t2 (a varchar(200)) engine=blackhole
+ master-bin.000001	#	Query	#	#	BEGIN
+ master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=581
+-master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a) ;file_id=#
++master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) ;file_id=#
+ master-bin.000001	#	Query	#	#	COMMIT
+ master-bin.000001	#	Query	#	#	use `test`; alter table t1 add b int
+ master-bin.000001	#	Query	#	#	use `test`; alter table t1 drop b
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2009-11-04 14:01:56.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2010-05-25 12:49:59.685032202 -0400
+@@ -625,7 +625,7 @@ master-bin.000001	#	Query	#	#	BEGIN
+ master-bin.000001	#	Intvar	#	#	INSERT_ID=10
+ master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+ master-bin.000001	#	Intvar	#	#	INSERT_ID=10
+-master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a, @b) SET b=((@b) + `bug27417`(2)) ;file_id=#
++master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @b) SET `b`=((@b) + `bug27417`(2)) ;file_id=#
+ master-bin.000001	#	Query	#	#	ROLLBACK
+ /* the output must denote there is the query */;
+ drop trigger trg_del_t2;
+@@ -863,7 +863,7 @@ master-bin.000001	#	User var	#	#	@`b`=_l
+ master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+ master-bin.000001	#	Intvar	#	#	INSERT_ID=10
+ master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
+-master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a, @b) SET b=((@b) + `bug27417`(2)) ;file_id=#
++master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @b) SET `b`=((@b) + `bug27417`(2)) ;file_id=#
+ master-bin.000001	#	Query	#	#	ROLLBACK
+ drop trigger trg_del_t2;
+ drop table t1,t2,t3,t4,t5;
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2009-11-04 14:02:31.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2010-05-25 12:49:59.685032202 -0400
+@@ -885,7 +885,7 @@ master-bin.000001	#	Query	1	#	use `test_
+ master-bin.000001	#	Xid	1	#	#
+ master-bin.000001	#	Query	1	#	BEGIN
+ master-bin.000001	#	Begin_load_query	1	#	;file_id=#;block_len=#
+-master-bin.000001	#	Execute_load_query	1	#	use `test_rpl`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE `t1` FIELDS TERMINATED BY '|' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (a, b) ;file_id=#
++master-bin.000001	#	Execute_load_query	1	#	use `test_rpl`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE `t1` FIELDS TERMINATED BY '|' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`) ;file_id=#
+ master-bin.000001	#	Xid	1	#	#
+ master-bin.000001	#	Query	1	#	BEGIN
+ master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2009-11-04 14:02:32.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2010-05-25 12:49:59.685032202 -0400
+@@ -53,7 +53,7 @@ Master_User	root
+ Master_Port	MASTER_PORT
+ Connect_Retry	1
+ Master_Log_File	master-bin.000001
+-Read_Master_Log_Pos	556
++Read_Master_Log_Pos	560
+ Relay_Log_File	#
+ Relay_Log_Pos	#
+ Relay_Master_Log_File	master-bin.000001
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_loaddata_map.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata_map.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_loaddata_map.result	2009-11-04 14:02:32.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata_map.result	2010-05-25 12:49:59.685032202 -0400
+@@ -20,7 +20,7 @@ master-bin.000001	#	Query	#	#	use `test`
+ master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+ master-bin.000001	#	Append_block	#	#	;file_id=#;block_len=#
+ master-bin.000001	#	Append_block	#	#	;file_id=#;block_len=#
+-master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (id) ;file_id=#
++master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' INTO TABLE `t2` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`id`) ;file_id=#
+ ==== Verify results on slave ====
+ [on slave]
+ select count(*) from t2 /* 5 000 */;
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_loaddata.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_loaddata.result	2009-11-04 14:02:32.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata.result	2010-05-25 12:49:59.685032202 -0400
+@@ -36,7 +36,7 @@ set global sql_slave_skip_counter=1;
+ start slave;
+ show slave status;
+ Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error
+-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	2009	#	#	master-bin.000001	Yes	Yes				#			0		0	2009	#	None		0	No						#	No	0		0	
++#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	2025	#	#	master-bin.000001	Yes	Yes				#			0		0	2025	#	None		0	No						#	No	0		0	
+ set sql_log_bin=0;
+ delete from t1;
+ set sql_log_bin=1;
+@@ -46,7 +46,7 @@ change master to master_user='test';
+ change master to master_user='root';
+ show slave status;
+ Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error
+-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	2044	#	#	master-bin.000001	No	No				#			0		0	2044	#	None		0	No						#	No	0		0	
++#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	2060	#	#	master-bin.000001	No	No				#			0		0	2060	#	None		0	No						#	No	0		0	
+ set global sql_slave_skip_counter=1;
+ start slave;
+ set sql_log_bin=0;
+@@ -115,3 +115,20 @@ use b48297_db1;
+ Comparing tables master:b48297_db1.t1 and slave:b48297_db1.t1
+ DROP DATABASE b48297_db1;
+ DROP DATABASE b42897_db2;
++stop slave;
++drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
++reset master;
++reset slave;
++drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
++start slave;
++use test;
++CREATE TABLE t1 (`key` TEXT, `text` TEXT);
++LOAD DATA INFILE '../../std_data/loaddata2.dat' REPLACE INTO TABLE `t1` FIELDS TERMINATED BY ',';
++SELECT * FROM t1;
++key	text
++Field A	'Field B'
++Field 1	'Field 2' 
++Field 3	'Field 4'
++'Field 5' 	'Field 6'
++Field 6	 'Field 7'
++DROP TABLE t1;
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_stm_log.result mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_stm_log.result
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_stm_log.result	2009-11-04 14:02:36.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_stm_log.result	2010-05-25 12:49:59.685032202 -0400
+@@ -25,7 +25,7 @@ master-bin.000001	#	Query	1	#	use `test`
+ master-bin.000001	#	Query	1	#	use `test`; drop table t1
+ master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
+ master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
+-master-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (word) ;file_id=1
++master-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (`word`) ;file_id=1
+ show binlog events from 106 limit 1;
+ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+ master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
+@@ -193,7 +193,7 @@ master-bin.000001	#	Query	#	#	use `test`
+ master-bin.000001	#	Query	#	#	use `test`; drop table t1
+ master-bin.000001	#	Query	#	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
+ master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
+-master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (word) ;file_id=#
++master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (`word`) ;file_id=#
+ master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+ show binlog events in 'master-bin.000002';
+ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+@@ -218,7 +218,7 @@ slave-bin.000001	#	Query	1	#	use `test`;
+ slave-bin.000001	#	Query	1	#	use `test`; drop table t1
+ slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
+ slave-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
+-slave-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE '../../tmp/SQL_LOAD-2-1-1.data' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (word) ;file_id=1
++slave-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE '../../tmp/SQL_LOAD-2-1-1.data' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (`word`) ;file_id=1
+ slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=MyISAM
+ slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
+ show binlog events in 'slave-bin.000002' from 4;
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//mysql-test/t/mysqlbinlog.test mysql-dfsg-5.1-5.1.41//mysql-test/t/mysqlbinlog.test
+--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/t/mysqlbinlog.test	2009-11-04 14:00:51.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//mysql-test/t/mysqlbinlog.test	2010-05-25 12:49:59.685032202 -0400
+@@ -71,7 +71,7 @@ select "--- --position --" as "";
+ --enable_query_log
+ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+ --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
+---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=330 $MYSQLD_DATADIR/master-bin.000002
++--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=332 $MYSQLD_DATADIR/master-bin.000002
+ 
+ 
+ # These are tests for remote binlog.
+@@ -108,7 +108,7 @@ select "--- --position --" as "";
+ --enable_query_log
+ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+ --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
+---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=330 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
++--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=332 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+ 
+ # Bug#7853 mysqlbinlog does not accept input from stdin
+ --disable_query_log
+diff -Naurp mysql-dfsg-5.1-5.1.41.orig//sql/sql_load.cc mysql-dfsg-5.1-5.1.41//sql/sql_load.cc
+--- mysql-dfsg-5.1-5.1.41.orig//sql/sql_load.cc	2009-11-04 13:31:04.000000000 -0500
++++ mysql-dfsg-5.1-5.1.41//sql/sql_load.cc	2010-05-25 12:49:59.685032202 -0400
+@@ -635,7 +635,11 @@ static bool write_execute_load_query_log
+       if (n++)
+         pfields.append(", ");
+       if (item->name)
++      {
++        pfields.append("`");
+         pfields.append(item->name);
++        pfields.append("`");
++      }
+       else
+         item->print(&pfields, QT_ORDINARY);
+     }
+@@ -655,7 +659,9 @@ static bool write_execute_load_query_log
+       val= lv++;
+       if (n++)
+         pfields.append(", ");
++      pfields.append("`");
+       pfields.append(item->name);
++      pfields.append("`");
+       pfields.append("=");
+       val->print(&pfields, QT_ORDINARY);
+     }