Merge lp:~laurynas-biveinis/percona-server/bug1214727 into lp:percona-server/5.6

Proposed by Laurynas Biveinis on 2013-10-15
Status: Merged
Approved by: Stewart Smith on 2013-10-16
Approved revision: 475
Merged at revision: 475
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1214727
Merge into: lp:percona-server/5.6
Diff against target: 68 lines (+13/-11)
4 files modified
Percona-Server/mysql-test/r/change_user_notembedded.result (+1/-1)
Percona-Server/mysql-test/r/failed_auth_3909.result (+1/-1)
Percona-Server/mysql-test/t/change_user_notembedded.test (+9/-8)
Percona-Server/mysql-test/t/failed_auth_3909.test (+2/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1214727
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve on 2013-10-16
Registry Administrators 2013-10-15 Pending
Review via email: mp+191104@code.launchpad.net

Description of the change

Fix bug 1214727 (Intermittent change_user_notembedded and
failed_auth_3909 Jenkins failures).

For both testcases the issue is incomplete adoption of the testcase to
the Oracle fix. The Oracle fix causes a session termination upon
invalid COM_CHANGE_USER, and the testcases expected it by error 2006
(CR_SERVER_LOST). However, depending entirely on timing, error 2013
(CR_SERVER_GONE_ERROR) might be returned instead and the testcases
should expect both. Fixed accordingly.

At the same time replace change_user_notembedded expected error codes
with their names for better testcase self-documentation and
maintenance.

http://jenkins.percona.com/job/percona-server-5.6-param/372/

To post a comment you must log in.
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/mysql-test/r/change_user_notembedded.result'
2--- Percona-Server/mysql-test/r/change_user_notembedded.result 2013-08-06 15:16:34 +0000
3+++ Percona-Server/mysql-test/r/change_user_notembedded.result 2013-10-15 05:14:57 +0000
4@@ -1,5 +1,5 @@
5 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
6-ERROR HY000: MySQL server has gone away
7+Got one of the listed errors
8 ERROR 42000: Unknown database 'mysql_native_password'
9 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)
10 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)
11
12=== modified file 'Percona-Server/mysql-test/r/failed_auth_3909.result'
13--- Percona-Server/mysql-test/r/failed_auth_3909.result 2013-08-06 15:16:34 +0000
14+++ Percona-Server/mysql-test/r/failed_auth_3909.result 2013-10-15 05:14:57 +0000
15@@ -14,7 +14,7 @@
16 connect(localhost,u2,password,test,MASTER_PORT,MASTER_SOCKET);
17 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
18 ERROR HY000: Plugin 'bar' is not loaded
19-ERROR HY000: MySQL server has gone away
20+Got one of the listed errors
21 ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
22 delete from mysql.user where plugin = 'bar';
23 flush privileges;
24
25=== modified file 'Percona-Server/mysql-test/t/change_user_notembedded.test'
26--- Percona-Server/mysql-test/t/change_user_notembedded.test 2013-08-06 15:16:34 +0000
27+++ Percona-Server/mysql-test/t/change_user_notembedded.test 2013-10-15 05:14:57 +0000
28@@ -8,18 +8,19 @@
29 #
30 connect (test,localhost,root,,);
31 connection test;
32---error 1045
33+--error ER_ACCESS_DENIED_ERROR
34 change_user foo,bar;
35---error 2006
36+# CR_SERVER_LOST, CR_SERVER_GONE_ERROR
37+--error 2006,2013
38 change_user foo;
39 --enable_reconnect
40---error 1049
41+--error ER_BAD_DB_ERROR
42 change_user;
43---error 1045
44-change_user foo,bar;
45---error 1045
46-change_user foo,bar;
47---error 1049
48+--error ER_ACCESS_DENIED_ERROR
49+change_user foo,bar;
50+--error ER_ACCESS_DENIED_ERROR
51+change_user foo,bar;
52+--error ER_BAD_DB_ERROR
53 change_user;
54 disconnect test;
55 connection default;
56
57=== modified file 'Percona-Server/mysql-test/t/failed_auth_3909.test'
58--- Percona-Server/mysql-test/t/failed_auth_3909.test 2013-08-06 15:16:34 +0000
59+++ Percona-Server/mysql-test/t/failed_auth_3909.test 2013-10-15 05:14:57 +0000
60@@ -25,7 +25,8 @@
61 --error ER_PLUGIN_IS_NOT_LOADED
62 change_user u1;
63
64---error 2006
65+# CR_SERVER_LOST, CR_SERVER_GONE_ERROR
66+--error 2006,2013
67 change_user u2;
68 --enable_reconnect
69

Subscribers

People subscribed via source and target branches