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

Merge lp:~percona-dev/percona-server/release-5.1.54-fix-bug-689830 into lp:percona-server/release-5.1.54-12

  1. release-5.1.54-fix-bug-689830
  2. Merge into 5.1.54
Proposed by Oleg Tsarev
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 186
Proposed branch: lp:~percona-dev/percona-server/release-5.1.54-fix-bug-689830
Merge into: lp:percona-server/release-5.1.54-12
Diff against target: 36 lines (+7/-3)
2 files modified
mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result (+1/-1)
mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test (+6/-2)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.54-fix-bug-689830
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Alexey Kopytov Pending
Review via email: mp+45241@code.launchpad.net

Description of the change

I change test for show_slave_status_nolock.patch - replace values in columns Slave_IO_Running and Slave_SQL_Running by constants, and add additional sleep (I didn't find quick in mysql-test-framework way without sleep).

To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

ok for 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/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result'
2--- mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result 2010-11-16 13:48:48 +0000
3+++ mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result 2011-01-05 14:29:44 +0000
4@@ -13,7 +13,7 @@
5 0
6 SHOW SLAVE STATUS NOLOCK;
7 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
8- host user port 1 master-bin.000001 276 slave-relay-bin.000003 422 master-bin.000001 No No 0 0 276 577 None 0 No NULL No 0 0
9+ host user port 1 master-bin.000001 276 slave-relay-bin.000003 422 master-bin.000001 Slave_IO_Running Slave_SQL_Running 0 0 276 577 None 0 No NULL No 0 0
10 select count(*) from t;
11 count(*)
12 0
13
14=== modified file 'mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test'
15--- mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test 2010-12-14 19:45:37 +0000
16+++ mysql-test/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test 2011-01-05 14:29:44 +0000
17@@ -7,14 +7,18 @@
18 -- enable_warnings
19 CREATE TABLE t(id INT);
20 sync_slave_with_master;
21+
22 connection master;
23 send INSERT INTO t SELECT SLEEP(5);
24-sleep 1;
25+
26 connection slave;
27+sleep 2;
28 send STOP SLAVE;
29+sleep 2;
30+
31 connection slave1;
32 select count(*) from t;
33-replace_column 2 host 3 user 4 port;
34+replace_column 2 host 3 user 4 port 11 Slave_IO_Running 12 Slave_SQL_Running;
35 SHOW SLAVE STATUS NOLOCK;
36 select count(*) from t;
37

Subscribers

People subscribed via source and target branches

to all changes: