summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2012-01-02 06:50:05 +0000
committerTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2012-01-02 06:50:05 +0000
commited1ba992c1d3c3ecbe6a2769c51ceb5d27606d3b (patch)
tree0aab7b4c9b85d988c5695333173c9c4de6c7ab98 /mysql-test
parentcb80ad09da1571b6ecf3668ced4f0272d9ef0167 (diff)
parent251fa88afacbd03a00894c04037d987b62f3ca58 (diff)
downloadmariadb-git-ed1ba992c1d3c3ecbe6a2769c51ceb5d27606d3b.tar.gz
manual up-merge of Bug#11755281
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/init_connect.result2
-rw-r--r--mysql-test/t/init_connect.test8
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/init_connect.result b/mysql-test/r/init_connect.result
index f5ec0bdc932..0ff6c206422 100644
--- a/mysql-test/r/init_connect.result
+++ b/mysql-test/r/init_connect.result
@@ -20,6 +20,8 @@ hex(a)
616263
set GLOBAL init_connect="adsfsdfsdfs";
select @a;
+ERROR 08S01: Aborted connection to db: 'test' user: 'user_1' host: 'localhost' (init_connect command failed)
+select @a;
Got one of the listed errors
drop table t1;
End of 4.1 tests
diff --git a/mysql-test/t/init_connect.test b/mysql-test/t/init_connect.test
index b6bac5f65fa..e96d02fe0d1 100644
--- a/mysql-test/t/init_connect.test
+++ b/mysql-test/t/init_connect.test
@@ -36,6 +36,14 @@ connection con0;
set GLOBAL init_connect="adsfsdfsdfs";
connect (con5,localhost,user_1,,);
connection con5;
+# BUG#11755281/47032: ERROR 2006 / ERROR 2013 INSTEAD OF PROPER ERROR MESSAGE
+# We now throw a proper error message here:
+--replace_regex /connection .* to/connection to/
+--error ER_NEW_ABORTING_CONNECTION
+select @a;
+# We got disconnected after receiving the above error message; any further
+# requests should fail with a notice that no one's listening to us.
+# --error CR_SERVER_GONE_ERROR,CR_SERVER_LOST
--error 2013,2006
select @a;
connection con0;