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

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

  1. bug1214727
  2. Merge into 5.6
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
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
Registry Administrators 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.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/mysql-test/r/change_user_notembedded.result'
--- Percona-Server/mysql-test/r/change_user_notembedded.result 2013-08-06 15:16:34 +0000
+++ Percona-Server/mysql-test/r/change_user_notembedded.result 2013-10-15 05:14:57 +0000
@@ -1,5 +1,5 @@
1ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)1ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
2ERROR HY000: MySQL server has gone away2Got one of the listed errors
3ERROR 42000: Unknown database 'mysql_native_password'3ERROR 42000: Unknown database 'mysql_native_password'
4ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)4ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)
5ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)5ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)
66
=== modified file 'Percona-Server/mysql-test/r/failed_auth_3909.result'
--- Percona-Server/mysql-test/r/failed_auth_3909.result 2013-08-06 15:16:34 +0000
+++ Percona-Server/mysql-test/r/failed_auth_3909.result 2013-10-15 05:14:57 +0000
@@ -14,7 +14,7 @@
14connect(localhost,u2,password,test,MASTER_PORT,MASTER_SOCKET);14connect(localhost,u2,password,test,MASTER_PORT,MASTER_SOCKET);
15ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)15ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
16ERROR HY000: Plugin 'bar' is not loaded16ERROR HY000: Plugin 'bar' is not loaded
17ERROR HY000: MySQL server has gone away17Got one of the listed errors
18ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)18ERROR 28000: Access denied for user 'u2'@'localhost' (using password: YES)
19delete from mysql.user where plugin = 'bar';19delete from mysql.user where plugin = 'bar';
20flush privileges;20flush privileges;
2121
=== modified file 'Percona-Server/mysql-test/t/change_user_notembedded.test'
--- Percona-Server/mysql-test/t/change_user_notembedded.test 2013-08-06 15:16:34 +0000
+++ Percona-Server/mysql-test/t/change_user_notembedded.test 2013-10-15 05:14:57 +0000
@@ -8,18 +8,19 @@
8#8#
9connect (test,localhost,root,,);9connect (test,localhost,root,,);
10connection test;10connection test;
11--error 104511--error ER_ACCESS_DENIED_ERROR
12change_user foo,bar;12change_user foo,bar;
13--error 200613# CR_SERVER_LOST, CR_SERVER_GONE_ERROR
14--error 2006,2013
14change_user foo;15change_user foo;
15--enable_reconnect16--enable_reconnect
16--error 104917--error ER_BAD_DB_ERROR
17change_user;18change_user;
18--error 104519--error ER_ACCESS_DENIED_ERROR
19change_user foo,bar;20change_user foo,bar;
20--error 104521--error ER_ACCESS_DENIED_ERROR
21change_user foo,bar;22change_user foo,bar;
22--error 104923--error ER_BAD_DB_ERROR
23change_user;24change_user;
24disconnect test;25disconnect test;
25connection default;26connection default;
2627
=== modified file 'Percona-Server/mysql-test/t/failed_auth_3909.test'
--- Percona-Server/mysql-test/t/failed_auth_3909.test 2013-08-06 15:16:34 +0000
+++ Percona-Server/mysql-test/t/failed_auth_3909.test 2013-10-15 05:14:57 +0000
@@ -25,7 +25,8 @@
25--error ER_PLUGIN_IS_NOT_LOADED25--error ER_PLUGIN_IS_NOT_LOADED
26change_user u1;26change_user u1;
2727
28--error 200628# CR_SERVER_LOST, CR_SERVER_GONE_ERROR
29--error 2006,2013
29change_user u2;30change_user u2;
30--enable_reconnect31--enable_reconnect
3132

Subscribers

People subscribed via source and target branches