Ubuntu
mysql-dfsg-5.1 package

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

  1. Lucid (10.04)
  2. sru-576949
  3. Merge into lucid-updates
Proposed by Clint Byrum
Status: Merged
Merge reported by: Benjamin Drung
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949
Merge into: lp:ubuntu/lucid-updates/mysql-dfsg-5.1
Diff against target: 351 lines (+331/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/00list (+1/-0)
debian/patches/63_cherrypick-upstream-49479.dpatch (+323/-0)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949
Reviewer Review Type Date Requested Status
Kees Cook Approve
Daniel Holbach (community) Needs Fixing
Ubuntu branches Pending
Review via email: mp+34951@code.launchpad.net
To post a comment you must log in.
lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949 updated
34. By Clint Byrum

Adding patch

Revision history for this message
Clint Byrum (clint-fewbar) wrote :

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

Revision history for this message
Dave Walker (davewalker) wrote :

Is this merge proposal still needed?

Thanks

Revision history for this message
Clint Byrum (clint-fewbar) wrote :

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

lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/sru-576949 updated
35. By Clint Byrum

merging with latest archive changes and adding DEP3 headers to patch

Revision history for this message
Daniel Holbach (dholbach) wrote :

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
Revision history for this message
Daniel Holbach (dholbach) wrote :

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
Revision history for this message
Martin Pitt (pitti) wrote :

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

Revision history for this message
Clint Byrum (clint-fewbar) wrote :

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 updated
36. By Clint Byrum

restoring mangled changelog entries

37. By Clint Byrum

merging with latest lucid-proposed changes

38. By Clint Byrum

fixing changelog and patch name

Revision history for this message
Clint Byrum (clint-fewbar) wrote :

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 updated
39. By Clint Byrum

fix patch name in changelog

Revision history for this message
Kees Cook (kees) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1mysql-dfsg-5.1 (5.1.41-3ubuntu12.10) lucid-proposed; urgency=low
2
3 * debian/patches/63_cherrypick-upstream-49479.dpatch: fixes LOAD DATA
4 INFILE when used in replication. (LP: #576949)
5
6 -- Clint Byrum <clint@ubuntu.com> Mon, 22 Nov 2010 06:14:16 -0800
7
1mysql-dfsg-5.1 (5.1.41-3ubuntu12.9) lucid-proposed; urgency=low8mysql-dfsg-5.1 (5.1.41-3ubuntu12.9) lucid-proposed; urgency=low
29
3 * added patch to fix a bug where certain ALTER TABLE queries would10 * added patch to fix a bug where certain ALTER TABLE queries would
411
=== 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 @@
3460_CVE-2010-38403460_CVE-2010-3840
3561_disable_longfilename_test3561_disable_longfilename_test
3662_alter_table_fix3662_alter_table_fix
3763_cherrypick-upstream-49479
3738
=== 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 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2#From: Clint Byrum <clint@ubuntu.com>
3#Description: Fixes LOAD DATA INFILE replication of tables needing escaping on their field naems
4#Bug: http://bugs.mysql.com/bug.php?id=49479
5#Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.1/+bug/576949
6#Origin: http://lists.mysql.com/commits/92988
7
8@DPATCH@
9diff -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
10--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/extra/rpl_tests/rpl_loaddata.test 2009-11-04 14:01:48.000000000 -0500
11+++ mysql-dfsg-5.1-5.1.41//mysql-test/extra/rpl_tests/rpl_loaddata.test 2010-05-25 12:49:59.685032202 -0400
12@@ -219,4 +219,18 @@ source include/diff_tables.inc;
13
14 -- sync_slave_with_master
15
16+# BUG#49479: LOAD DATA INFILE is binlogged without escaping field names
17+-- source include/master-slave-reset.inc
18+-- connection master
19+use test;
20+CREATE TABLE t1 (`key` TEXT, `text` TEXT);
21+
22+LOAD DATA INFILE '../../std_data/loaddata2.dat' REPLACE INTO TABLE `t1` FIELDS TERMINATED BY ',';
23+SELECT * FROM t1;
24+
25+-- sync_slave_with_master
26+-- connection master
27+DROP TABLE t1;
28+-- sync_slave_with_master
29+
30 # End of 4.1 tests
31diff -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
32--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/r/mysqlbinlog.result 2009-11-04 14:01:20.000000000 -0500
33+++ mysql-dfsg-5.1-5.1.41//mysql-test/r/mysqlbinlog.result 2010-05-25 12:49:59.685032202 -0400
34@@ -44,16 +44,16 @@ SET TIMESTAMP=1000000000/*!*/;
35 insert into t2 values ()
36 /*!*/;
37 SET TIMESTAMP=1000000000/*!*/;
38-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)
39+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`)
40 /*!*/;
41 SET TIMESTAMP=1000000000/*!*/;
42-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)
43+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`)
44 /*!*/;
45 SET TIMESTAMP=1000000000/*!*/;
46-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)
47+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`)
48 /*!*/;
49 SET TIMESTAMP=1000000000/*!*/;
50-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)
51+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`)
52 /*!*/;
53 DELIMITER ;
54 # End of log file
55@@ -144,16 +144,16 @@ SET TIMESTAMP=1000000000/*!*/;
56 insert into t2 values ()
57 /*!*/;
58 SET TIMESTAMP=1000000000/*!*/;
59-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)
60+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`)
61 /*!*/;
62 SET TIMESTAMP=1000000000/*!*/;
63-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)
64+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`)
65 /*!*/;
66 SET TIMESTAMP=1000000000/*!*/;
67-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)
68+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`)
69 /*!*/;
70 SET TIMESTAMP=1000000000/*!*/;
71-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)
72+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`)
73 /*!*/;
74 DELIMITER ;
75 # End of log file
76@@ -359,29 +359,29 @@ SET @@session.collation_database=DEFAULT
77 create table t1 (a varchar(64) character set utf8)
78 /*!*/;
79 SET TIMESTAMP=1000000000/*!*/;
80-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)
81+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`)
82 /*!*/;
83 SET TIMESTAMP=1000000000/*!*/;
84 SET @@session.collation_database=7/*!*/;
85-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)
86+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`)
87 /*!*/;
88 SET TIMESTAMP=1000000000/*!*/;
89 SET @@session.collation_database=DEFAULT/*!*/;
90-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)
91+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`)
92 /*!*/;
93 SET TIMESTAMP=1000000000/*!*/;
94-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)
95+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`)
96 /*!*/;
97 SET TIMESTAMP=1000000000/*!*/;
98 SET @@session.collation_database=7/*!*/;
99-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)
100+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`)
101 /*!*/;
102 SET TIMESTAMP=1000000000/*!*/;
103 SET @@session.collation_database=DEFAULT/*!*/;
104-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)
105+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`)
106 /*!*/;
107 SET TIMESTAMP=1000000000/*!*/;
108-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)
109+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`)
110 /*!*/;
111 SET TIMESTAMP=1000000000/*!*/;
112 drop table t1
113diff -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
114--- 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
115+++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_killed_simulate.result 2010-05-25 12:49:59.685032202 -0400
116@@ -19,7 +19,7 @@ ERROR 70100: Query execution was interru
117 show binlog events from <binlog_start>;
118 Log_name Pos Event_type Server_id End_log_pos Info
119 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
120-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=#
121+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=#
122 select
123 (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
124 is not null;
125diff -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
126--- 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
127+++ 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
128@@ -929,7 +929,7 @@ master-bin.000001 # User var # # @`b`=_l
129 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
130 master-bin.000001 # Intvar # # INSERT_ID=10
131 master-bin.000001 # User var # # @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
132-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=#
133+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=#
134 master-bin.000001 # Query # # ROLLBACK
135 drop trigger trg_del_t2;
136 drop table t1,t2,t3,t4,t5;
137diff -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
138--- 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
139+++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/binlog/r/binlog_stm_blackhole.result 2010-05-25 12:49:59.685032202 -0400
140@@ -127,7 +127,7 @@ master-bin.000001 # Query # # COMMIT
141 master-bin.000001 # Query # # use `test`; create table t2 (a varchar(200)) engine=blackhole
142 master-bin.000001 # Query # # BEGIN
143 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=581
144-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=#
145+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=#
146 master-bin.000001 # Query # # COMMIT
147 master-bin.000001 # Query # # use `test`; alter table t1 add b int
148 master-bin.000001 # Query # # use `test`; alter table t1 drop b
149diff -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
150--- 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
151+++ 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
152@@ -625,7 +625,7 @@ master-bin.000001 # Query # # BEGIN
153 master-bin.000001 # Intvar # # INSERT_ID=10
154 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
155 master-bin.000001 # Intvar # # INSERT_ID=10
156-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=#
157+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=#
158 master-bin.000001 # Query # # ROLLBACK
159 /* the output must denote there is the query */;
160 drop trigger trg_del_t2;
161@@ -863,7 +863,7 @@ master-bin.000001 # User var # # @`b`=_l
162 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
163 master-bin.000001 # Intvar # # INSERT_ID=10
164 master-bin.000001 # User var # # @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
165-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=#
166+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=#
167 master-bin.000001 # Query # # ROLLBACK
168 drop trigger trg_del_t2;
169 drop table t1,t2,t3,t4,t5;
170diff -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
171--- 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
172+++ 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
173@@ -885,7 +885,7 @@ master-bin.000001 # Query 1 # use `test_
174 master-bin.000001 # Xid 1 # #
175 master-bin.000001 # Query 1 # BEGIN
176 master-bin.000001 # Begin_load_query 1 # ;file_id=#;block_len=#
177-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=#
178+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=#
179 master-bin.000001 # Xid 1 # #
180 master-bin.000001 # Query 1 # BEGIN
181 master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t1
182diff -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
183--- 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
184+++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata_fatal.result 2010-05-25 12:49:59.685032202 -0400
185@@ -53,7 +53,7 @@ Master_User root
186 Master_Port MASTER_PORT
187 Connect_Retry 1
188 Master_Log_File master-bin.000001
189-Read_Master_Log_Pos 556
190+Read_Master_Log_Pos 560
191 Relay_Log_File #
192 Relay_Log_Pos #
193 Relay_Master_Log_File master-bin.000001
194diff -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
195--- 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
196+++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata_map.result 2010-05-25 12:49:59.685032202 -0400
197@@ -20,7 +20,7 @@ master-bin.000001 # Query # # use `test`
198 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
199 master-bin.000001 # Append_block # # ;file_id=#;block_len=#
200 master-bin.000001 # Append_block # # ;file_id=#;block_len=#
201-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=#
202+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=#
203 ==== Verify results on slave ====
204 [on slave]
205 select count(*) from t2 /* 5 000 */;
206diff -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
207--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/suite/rpl/r/rpl_loaddata.result 2009-11-04 14:02:32.000000000 -0500
208+++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_loaddata.result 2010-05-25 12:49:59.685032202 -0400
209@@ -36,7 +36,7 @@ set global sql_slave_skip_counter=1;
210 start slave;
211 show slave status;
212 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
213-# 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
214+# 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
215 set sql_log_bin=0;
216 delete from t1;
217 set sql_log_bin=1;
218@@ -46,7 +46,7 @@ change master to master_user='test';
219 change master to master_user='root';
220 show slave status;
221 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
222-# 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
223+# 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
224 set global sql_slave_skip_counter=1;
225 start slave;
226 set sql_log_bin=0;
227@@ -115,3 +115,20 @@ use b48297_db1;
228 Comparing tables master:b48297_db1.t1 and slave:b48297_db1.t1
229 DROP DATABASE b48297_db1;
230 DROP DATABASE b42897_db2;
231+stop slave;
232+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
233+reset master;
234+reset slave;
235+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
236+start slave;
237+use test;
238+CREATE TABLE t1 (`key` TEXT, `text` TEXT);
239+LOAD DATA INFILE '../../std_data/loaddata2.dat' REPLACE INTO TABLE `t1` FIELDS TERMINATED BY ',';
240+SELECT * FROM t1;
241+key text
242+Field A 'Field B'
243+Field 1 'Field 2'
244+Field 3 'Field 4'
245+'Field 5' 'Field 6'
246+Field 6 'Field 7'
247+DROP TABLE t1;
248diff -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
249--- 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
250+++ mysql-dfsg-5.1-5.1.41//mysql-test/suite/rpl/r/rpl_stm_log.result 2010-05-25 12:49:59.685032202 -0400
251@@ -25,7 +25,7 @@ master-bin.000001 # Query 1 # use `test`
252 master-bin.000001 # Query 1 # use `test`; drop table t1
253 master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
254 master-bin.000001 # Begin_load_query 1 # ;file_id=1;block_len=581
255-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
256+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
257 show binlog events from 106 limit 1;
258 Log_name Pos Event_type Server_id End_log_pos Info
259 master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
260@@ -193,7 +193,7 @@ master-bin.000001 # Query # # use `test`
261 master-bin.000001 # Query # # use `test`; drop table t1
262 master-bin.000001 # Query # # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
263 master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
264-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=#
265+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=#
266 master-bin.000001 # Rotate # # master-bin.000002;pos=4
267 show binlog events in 'master-bin.000002';
268 Log_name Pos Event_type Server_id End_log_pos Info
269@@ -218,7 +218,7 @@ slave-bin.000001 # Query 1 # use `test`;
270 slave-bin.000001 # Query 1 # use `test`; drop table t1
271 slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
272 slave-bin.000001 # Begin_load_query 1 # ;file_id=1;block_len=581
273-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
274+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
275 slave-bin.000001 # Query 1 # use `test`; create table t3 (a int)ENGINE=MyISAM
276 slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
277 show binlog events in 'slave-bin.000002' from 4;
278diff -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
279--- mysql-dfsg-5.1-5.1.41.orig//mysql-test/t/mysqlbinlog.test 2009-11-04 14:00:51.000000000 -0500
280+++ mysql-dfsg-5.1-5.1.41//mysql-test/t/mysqlbinlog.test 2010-05-25 12:49:59.685032202 -0400
281@@ -71,7 +71,7 @@ select "--- --position --" as "";
282 --enable_query_log
283 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
284 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
285---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=330 $MYSQLD_DATADIR/master-bin.000002
286+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=332 $MYSQLD_DATADIR/master-bin.000002
287
288
289 # These are tests for remote binlog.
290@@ -108,7 +108,7 @@ select "--- --position --" as "";
291 --enable_query_log
292 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
293 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
294---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
295+--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
296
297 # Bug#7853 mysqlbinlog does not accept input from stdin
298 --disable_query_log
299diff -Naurp mysql-dfsg-5.1-5.1.41.orig//sql/sql_load.cc mysql-dfsg-5.1-5.1.41//sql/sql_load.cc
300--- mysql-dfsg-5.1-5.1.41.orig//sql/sql_load.cc 2009-11-04 13:31:04.000000000 -0500
301+++ mysql-dfsg-5.1-5.1.41//sql/sql_load.cc 2010-05-25 12:49:59.685032202 -0400
302@@ -635,7 +635,11 @@ static bool write_execute_load_query_log
303 if (n++)
304 pfields.append(", ");
305 if (item->name)
306+ {
307+ pfields.append("`");
308 pfields.append(item->name);
309+ pfields.append("`");
310+ }
311 else
312 item->print(&pfields, QT_ORDINARY);
313 }
314@@ -655,7 +659,9 @@ static bool write_execute_load_query_log
315 val= lv++;
316 if (n++)
317 pfields.append(", ");
318+ pfields.append("`");
319 pfields.append(item->name);
320+ pfields.append("`");
321 pfields.append("=");
322 val->print(&pfields, QT_ORDINARY);
323 }

Subscribers

People subscribed via source and target branches

to all changes: