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
=== modified file 'patches/mysql-test-rnt.diff'
--- patches/mysql-test-rnt.diff 2011-11-17 16:57:05 +0000
+++ patches/mysql-test-rnt.diff 2012-02-06 06:03:18 +0000
@@ -1586,38 +1586,6 @@
1586 insert into t1 values ("Alas");1586 insert into t1 values ("Alas");
1587 flush logs;1587 flush logs;
1588 1588
1589@@ -220,7 +222,6 @@
1590 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1591 DELIMITER /*!*/;
1592 ROLLBACK/*!*/;
1593-use test/*!*/;
1594 SET TIMESTAMP=1108844556/*!*/;
1595 SET @@session.pseudo_thread_id=999999999/*!*/;
1596 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
1597@@ -228,6 +229,7 @@
1598 SET @@session.collation_database=DEFAULT/*!*/;
1599 BEGIN
1600 /*!*/;
1601+use test/*!*/;
1602 SET TIMESTAMP=1108844555/*!*/;
1603 insert t1 values (1)
1604 /*!*/;
1605@@ -239,7 +241,6 @@
1606 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
1607 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1608 DELIMITER /*!*/;
1609-use test/*!*/;
1610 SET TIMESTAMP=1108844556/*!*/;
1611 SET @@session.pseudo_thread_id=999999999/*!*/;
1612 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
1613@@ -247,6 +248,7 @@
1614 SET @@session.collation_database=DEFAULT/*!*/;
1615 BEGIN
1616 /*!*/;
1617+use test/*!*/;
1618 SET TIMESTAMP=1108844555/*!*/;
1619 insert t1 values (1)
1620 /*!*/;
1621@@ -255,6 +257,7 @@1589@@ -255,6 +257,7 @@
1622 ROLLBACK /* added by mysqlbinlog */;1590 ROLLBACK /* added by mysqlbinlog */;
1623 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;1591 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
@@ -1644,34 +1612,6 @@
1644 /*!*/;1612 /*!*/;
1645 SET TIMESTAMP=1000000000/*!*/;1613 SET TIMESTAMP=1000000000/*!*/;
1646 drop table t11614 drop table t1
1647@@ -581,7 +584,6 @@
1648 SET @@session.collation_database=DEFAULT/*!*/;
1649 BEGIN
1650 /*!*/;
1651-use test/*!*/;
1652 SET TIMESTAMP=1266652094/*!*/;
1653 SavePoint mixed_cases
1654 /*!*/;
1655@@ -592,11 +594,9 @@
1656 SET TIMESTAMP=1266652094/*!*/;
1657 INSERT INTO db1.t1 VALUES(40)
1658 /*!*/;
1659-use test/*!*/;
1660 SET TIMESTAMP=1266652094/*!*/;
1661 ROLLBACK TO mixed_cases
1662 /*!*/;
1663-use db1/*!*/;
1664 SET TIMESTAMP=1266652094/*!*/;
1665 INSERT INTO db1.t2 VALUES("after rollback to")
1666 /*!*/;
1667@@ -624,7 +624,6 @@
1668 SET @@session.collation_database=DEFAULT/*!*/;
1669 BEGIN
1670 /*!*/;
1671-use test/*!*/;
1672 SET TIMESTAMP=1266652094/*!*/;
1673 SavePoint mixed_cases
1674 /*!*/;
1675--- /dev/null1615--- /dev/null
1676+++ b/mysql-test/r/percona_fast_alter_column.result1616+++ b/mysql-test/r/percona_fast_alter_column.result
1677@@ -0,0 +1,47 @@1617@@ -0,0 +1,47 @@
16781618
=== modified file 'patches/mysqlbinlog_fix.patch'
--- patches/mysqlbinlog_fix.patch 2012-01-31 07:48:18 +0000
+++ patches/mysqlbinlog_fix.patch 2012-02-06 06:03:18 +0000
@@ -41,3 +41,65 @@
41 mysql= mysql_init(NULL);41 mysql= mysql_init(NULL);
42 42
43 if (!mysql)43 if (!mysql)
44--- a/mysql-test/r/mysqlbinlog.result
45+++ b/mysql-test/r/mysqlbinlog.result
46@@ -222,7 +222,6 @@ ROLLBACK /* added by mysqlbinlog */;
47 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
48 DELIMITER /*!*/;
49 ROLLBACK/*!*/;
50-use test/*!*/;
51 SET TIMESTAMP=1108844556/*!*/;
52 SET @@session.pseudo_thread_id=999999999/*!*/;
53 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
54@@ -230,6 +229,7 @@ SET @@session.lc_time_names=0/*!*/;
55 SET @@session.collation_database=DEFAULT/*!*/;
56 BEGIN
57 /*!*/;
58+use test/*!*/;
59 SET TIMESTAMP=1108844555/*!*/;
60 insert t1 values (1)
61 /*!*/;
62@@ -241,7 +241,6 @@ Warning: The option '--position' is depr
63 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
64 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
65 DELIMITER /*!*/;
66-use test/*!*/;
67 SET TIMESTAMP=1108844556/*!*/;
68 SET @@session.pseudo_thread_id=999999999/*!*/;
69 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
70@@ -249,6 +248,7 @@ SET @@session.lc_time_names=0/*!*/;
71 SET @@session.collation_database=DEFAULT/*!*/;
72 BEGIN
73 /*!*/;
74+use test/*!*/;
75 SET TIMESTAMP=1108844555/*!*/;
76 insert t1 values (1)
77 /*!*/;
78@@ -584,7 +584,6 @@ SET @@session.lc_time_names=0/*!*/;
79 SET @@session.collation_database=DEFAULT/*!*/;
80 BEGIN
81 /*!*/;
82-use test/*!*/;
83 SET TIMESTAMP=1266652094/*!*/;
84 SavePoint mixed_cases
85 /*!*/;
86@@ -595,11 +594,9 @@ INSERT INTO db1.t2 VALUES("in savepoint
87 SET TIMESTAMP=1266652094/*!*/;
88 INSERT INTO db1.t1 VALUES(40)
89 /*!*/;
90-use test/*!*/;
91 SET TIMESTAMP=1266652094/*!*/;
92 ROLLBACK TO mixed_cases
93 /*!*/;
94-use db1/*!*/;
95 SET TIMESTAMP=1266652094/*!*/;
96 INSERT INTO db1.t2 VALUES("after rollback to")
97 /*!*/;
98@@ -627,7 +624,6 @@ SET @@session.lc_time_names=0/*!*/;
99 SET @@session.collation_database=DEFAULT/*!*/;
100 BEGIN
101 /*!*/;
102-use test/*!*/;
103 SET TIMESTAMP=1266652094/*!*/;
104 SavePoint mixed_cases
105 /*!*/;

Subscribers

People subscribed via source and target branches