Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~tsarev/percona-server/18205_01_mysqlbinlog_fix.patch into lp:percona-server/rnt-5.1

  1. 18205_01_mysqlbinlog_fix.patch
  2. Merge into rnt-5.1
Proposed by Oleg Tsarev
Status: Merged
Merged at revision: 211
Proposed branch: lp:~tsarev/percona-server/18205_01_mysqlbinlog_fix.patch
Merge into: lp:percona-server/rnt-5.1
Diff against target: 147 lines (+62/-60)
2 files modified
patches/mysql-test-rnt.diff (+0/-60)
patches/mysqlbinlog_fix.patch (+62/-0)
To merge this branch: bzr merge lp:~tsarev/percona-server/18205_01_mysqlbinlog_fix.patch
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+91609@code.launchpad.net

Description of the change

Move changes in mysqlbinlog.result related to mysqlbinlog_fix.patch from mysql-test-rnt.diff to mysqlbinlog_fix.patch.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM, thank you.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/mysql-test-rnt.diff'
2--- patches/mysql-test-rnt.diff 2011-11-17 16:57:05 +0000
3+++ patches/mysql-test-rnt.diff 2012-02-06 06:03:18 +0000
4@@ -1586,38 +1586,6 @@
5 insert into t1 values ("Alas");
6 flush logs;
7
8-@@ -220,7 +222,6 @@
9- /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
10- DELIMITER /*!*/;
11- ROLLBACK/*!*/;
12--use test/*!*/;
13- SET TIMESTAMP=1108844556/*!*/;
14- SET @@session.pseudo_thread_id=999999999/*!*/;
15- SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
16-@@ -228,6 +229,7 @@
17- SET @@session.collation_database=DEFAULT/*!*/;
18- BEGIN
19- /*!*/;
20-+use test/*!*/;
21- SET TIMESTAMP=1108844555/*!*/;
22- insert t1 values (1)
23- /*!*/;
24-@@ -239,7 +241,6 @@
25- /*!40019 SET @@session.max_insert_delayed_threads=0*/;
26- /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
27- DELIMITER /*!*/;
28--use test/*!*/;
29- SET TIMESTAMP=1108844556/*!*/;
30- SET @@session.pseudo_thread_id=999999999/*!*/;
31- SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
32-@@ -247,6 +248,7 @@
33- SET @@session.collation_database=DEFAULT/*!*/;
34- BEGIN
35- /*!*/;
36-+use test/*!*/;
37- SET TIMESTAMP=1108844555/*!*/;
38- insert t1 values (1)
39- /*!*/;
40 @@ -255,6 +257,7 @@
41 ROLLBACK /* added by mysqlbinlog */;
42 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
43@@ -1644,34 +1612,6 @@
44 /*!*/;
45 SET TIMESTAMP=1000000000/*!*/;
46 drop table t1
47-@@ -581,7 +584,6 @@
48- SET @@session.collation_database=DEFAULT/*!*/;
49- BEGIN
50- /*!*/;
51--use test/*!*/;
52- SET TIMESTAMP=1266652094/*!*/;
53- SavePoint mixed_cases
54- /*!*/;
55-@@ -592,11 +594,9 @@
56- SET TIMESTAMP=1266652094/*!*/;
57- INSERT INTO db1.t1 VALUES(40)
58- /*!*/;
59--use test/*!*/;
60- SET TIMESTAMP=1266652094/*!*/;
61- ROLLBACK TO mixed_cases
62- /*!*/;
63--use db1/*!*/;
64- SET TIMESTAMP=1266652094/*!*/;
65- INSERT INTO db1.t2 VALUES("after rollback to")
66- /*!*/;
67-@@ -624,7 +624,6 @@
68- SET @@session.collation_database=DEFAULT/*!*/;
69- BEGIN
70- /*!*/;
71--use test/*!*/;
72- SET TIMESTAMP=1266652094/*!*/;
73- SavePoint mixed_cases
74- /*!*/;
75 --- /dev/null
76 +++ b/mysql-test/r/percona_fast_alter_column.result
77 @@ -0,0 +1,47 @@
78
79=== modified file 'patches/mysqlbinlog_fix.patch'
80--- patches/mysqlbinlog_fix.patch 2012-01-31 07:48:18 +0000
81+++ patches/mysqlbinlog_fix.patch 2012-02-06 06:03:18 +0000
82@@ -41,3 +41,65 @@
83 mysql= mysql_init(NULL);
84
85 if (!mysql)
86+--- a/mysql-test/r/mysqlbinlog.result
87++++ b/mysql-test/r/mysqlbinlog.result
88+@@ -222,7 +222,6 @@ ROLLBACK /* added by mysqlbinlog */;
89+ /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
90+ DELIMITER /*!*/;
91+ ROLLBACK/*!*/;
92+-use test/*!*/;
93+ SET TIMESTAMP=1108844556/*!*/;
94+ SET @@session.pseudo_thread_id=999999999/*!*/;
95+ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
96+@@ -230,6 +229,7 @@ SET @@session.lc_time_names=0/*!*/;
97+ SET @@session.collation_database=DEFAULT/*!*/;
98+ BEGIN
99+ /*!*/;
100++use test/*!*/;
101+ SET TIMESTAMP=1108844555/*!*/;
102+ insert t1 values (1)
103+ /*!*/;
104+@@ -241,7 +241,6 @@ Warning: The option '--position' is depr
105+ /*!40019 SET @@session.max_insert_delayed_threads=0*/;
106+ /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
107+ DELIMITER /*!*/;
108+-use test/*!*/;
109+ SET TIMESTAMP=1108844556/*!*/;
110+ SET @@session.pseudo_thread_id=999999999/*!*/;
111+ SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
112+@@ -249,6 +248,7 @@ SET @@session.lc_time_names=0/*!*/;
113+ SET @@session.collation_database=DEFAULT/*!*/;
114+ BEGIN
115+ /*!*/;
116++use test/*!*/;
117+ SET TIMESTAMP=1108844555/*!*/;
118+ insert t1 values (1)
119+ /*!*/;
120+@@ -584,7 +584,6 @@ SET @@session.lc_time_names=0/*!*/;
121+ SET @@session.collation_database=DEFAULT/*!*/;
122+ BEGIN
123+ /*!*/;
124+-use test/*!*/;
125+ SET TIMESTAMP=1266652094/*!*/;
126+ SavePoint mixed_cases
127+ /*!*/;
128+@@ -595,11 +594,9 @@ INSERT INTO db1.t2 VALUES("in savepoint
129+ SET TIMESTAMP=1266652094/*!*/;
130+ INSERT INTO db1.t1 VALUES(40)
131+ /*!*/;
132+-use test/*!*/;
133+ SET TIMESTAMP=1266652094/*!*/;
134+ ROLLBACK TO mixed_cases
135+ /*!*/;
136+-use db1/*!*/;
137+ SET TIMESTAMP=1266652094/*!*/;
138+ INSERT INTO db1.t2 VALUES("after rollback to")
139+ /*!*/;
140+@@ -627,7 +624,6 @@ SET @@session.lc_time_names=0/*!*/;
141+ SET @@session.collation_database=DEFAULT/*!*/;
142+ BEGIN
143+ /*!*/;
144+-use test/*!*/;
145+ SET TIMESTAMP=1266652094/*!*/;
146+ SavePoint mixed_cases
147+ /*!*/;

Subscribers

People subscribed via source and target branches