Merge lp:~percona-dev/percona-server/release-5.1.52-12-fix-bug-676148 into lp:~percona-dev/percona-server/release-5.1.52-12

Proposed by Oleg Tsarev on 2010-11-18
Status: Merged
Approved by: Alexey Kopytov on 2010-11-18
Approved revision: 145
Merged at revision: 144
Proposed branch: lp:~percona-dev/percona-server/release-5.1.52-12-fix-bug-676148
Merge into: lp:~percona-dev/percona-server/release-5.1.52-12
Diff against target: 148 lines (+7/-49)
2 files modified
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result (+0/-12)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test (+7/-37)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.52-12-fix-bug-676148
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2010-11-18 Approve on 2010-11-18
Review via email: mp+41157@code.launchpad.net

Commit message

Description of the change

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result'
2--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result 2010-11-05 11:47:33 +0000
3+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result 2010-11-18 11:51:13 +0000
4@@ -11,8 +11,6 @@
5 # Start slave replication
6 START SLAVE;
7 INSERT INTO t VALUES (1);
8-# Read information about master binlog
9-# Sync(1) slave thread
10 # Read and change log_slow_slave_statements to ON on slave
11 show variables like 'log_slow_slave_statements';
12 Variable_name Value
13@@ -22,14 +20,10 @@
14 Variable_name Value
15 log_slow_slave_statements ON
16 INSERT INTO t VALUES (2);
17-# Read information about master binlog
18-# Sync slave(2) thread
19 # Restart slave
20 STOP SLAVE;
21 START SLAVE;
22 INSERT INTO t VALUES (3);
23-# Read information about master binlog
24-# Sync(3) slave thread
25 show variables like 'long_query_time';
26 Variable_name Value
27 long_query_time 1.000000
28@@ -50,8 +44,6 @@
29 Variable_name Value
30 use_global_long_query_time OFF
31 INSERT INTO t VALUES (4);
32-# Read information about master binlog
33-# Sync slave(4) thread
34 show variables like 'long_query_time';
35 Variable_name Value
36 long_query_time 1.000000
37@@ -72,8 +64,6 @@
38 Variable_name Value
39 use_global_long_query_time ON
40 INSERT INTO t VALUES (5);
41-# Read information about master binlog
42-# Sync slave(5) thread
43 show variables like 'long_query_time';
44 Variable_name Value
45 long_query_time 0.000000
46@@ -99,5 +89,3 @@
47 1
48 set global log_slow_slave_statements=OFF;
49 DROP TABLE t;
50-# Read information about master binlog
51-# Sync slave(6) thread
52
53=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test'
54--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-11-05 11:47:33 +0000
55+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2010-11-18 11:51:13 +0000
56@@ -1,3 +1,4 @@
57+-- source include/have_binlog_format_mixed_or_statement.inc
58 -- echo # Activate master-slave replication
59 -- source include/master-slave.inc
60
61@@ -19,14 +20,8 @@
62 #-- echo # Make insert(1) on master
63 connection master;
64 INSERT INTO t VALUES (1);
65--- echo # Read information about master binlog
66-let $binlog_file = query_get_value(SHOW MASTER STATUS,File,1);
67-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
68-
69--- echo # Sync(1) slave thread
70+sync_slave_with_master;
71 connection slave;
72-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
73-
74 -- echo # Read and change log_slow_slave_statements to ON on slave
75 show variables like 'log_slow_slave_statements';
76 set global log_slow_slave_statements=ON;
77@@ -35,13 +30,8 @@
78 #-- echo # Make insert(2) on master
79 connection master;
80 INSERT INTO t VALUES (2);
81--- echo # Read information about master binlog
82-let $binlog_file = query_get_value(SHOW MASTER STATUS,File,1);
83-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
84-
85--- echo # Sync slave(2) thread
86+sync_slave_with_master;
87 connection slave;
88-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
89 -- echo # Restart slave
90 STOP SLAVE;
91 -- source include/wait_for_slave_to_stop.inc
92@@ -51,13 +41,8 @@
93 #-- echo # Make insert(3) on master
94 connection master;
95 INSERT INTO t VALUES (3);
96--- echo # Read information about master binlog
97-let $binlog_file = query_get_value(SHOW MASTER STATUS,File,1);
98-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
99-
100--- echo # Sync(3) slave thread
101+sync_slave_with_master;
102 connection slave;
103-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
104 show variables like 'long_query_time';
105 show global variables like 'long_query_time';
106 show global variables like 'use_global_long_query_time';
107@@ -69,13 +54,8 @@
108 #-- echo # Make insert(4) on master
109 connection master;
110 INSERT INTO t VALUES (4);
111--- echo # Read information about master binlog
112-let $binlog_file = query_get_value(SHOW MASTER STATUS,File,1);
113-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
114-
115--- echo # Sync slave(4) thread
116+sync_slave_with_master;
117 connection slave;
118-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
119 show variables like 'long_query_time';
120 show global variables like 'long_query_time';
121 show global variables like 'use_global_long_query_time';
122@@ -87,13 +67,8 @@
123 #-- echo # Make insert(5) on master
124 connection master;
125 INSERT INTO t VALUES (5);
126--- echo # Read information about master binlog
127-let $binlog_file = query_get_value(SHOW MASTER STATUS,File,1);
128-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
129-
130--- echo # Sync slave(5) thread
131+sync_slave_with_master;
132 connection slave;
133-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
134 show variables like 'long_query_time';
135 show global variables like 'long_query_time';
136 show global variables like 'use_global_long_query_time';
137@@ -128,10 +103,5 @@
138 connection master;
139 DROP TABLE t;
140
141--- echo # Read information about master binlog
142-let $binlog_file = query_get_value(SHOW MASTER STATUS,File,1);
143-let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
144-
145--- echo # Sync slave(6) thread
146+sync_slave_with_master;
147 connection slave;
148-let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;

Subscribers

People subscribed via source and target branches

to all changes: