summaryrefslogtreecommitdiff
path: root/mysql-test/t/skip_name_resolve.test
diff options
context:
space:
mode:
authorMatthias Leich <Matthias.Leich@sun.com>2009-03-10 16:54:24 +0100
committerMatthias Leich <Matthias.Leich@sun.com>2009-03-10 16:54:24 +0100
commit8b055e24444f4512b051598e0ef60d1e52b228a3 (patch)
treec86c4ae9576d6440b25f0921f42426be0dfa4463 /mysql-test/t/skip_name_resolve.test
parent2b87788517cc734cbf0169e68ea5f983237b73a3 (diff)
parent2417d31045cde81881a9dd7991263210687d5fc8 (diff)
downloadmariadb-git-8b055e24444f4512b051598e0ef60d1e52b228a3.tar.gz
Merge into actual tree
Diffstat (limited to 'mysql-test/t/skip_name_resolve.test')
-rw-r--r--mysql-test/t/skip_name_resolve.test18
1 files changed, 13 insertions, 5 deletions
diff --git a/mysql-test/t/skip_name_resolve.test b/mysql-test/t/skip_name_resolve.test
index 4b01c7ef913..df010d15fa0 100644
--- a/mysql-test/t/skip_name_resolve.test
+++ b/mysql-test/t/skip_name_resolve.test
@@ -1,7 +1,10 @@
# Can't be tested with embedded server
--- source include/not_embedded.inc
+--source include/not_embedded.inc
-# Bug #8471: IP address with mask fail when skip-name-resolve is on
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+# Bug#8471 IP address with mask fail when skip-name-resolve is on
GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255';
SHOW GRANTS FOR mysqltest_1@'127.0.0.1/255.255.255.255';
REVOKE ALL ON test.* FROM mysqltest_1@'127.0.0.1/255.255.255.255';
@@ -9,15 +12,20 @@ DROP USER mysqltest_1@'127.0.0.1/255.255.255.255';
# End of 4.1 tests
-# Bug #13407 "Remote connecting crashes server".
+# Bug#13407 Remote connecting crashes server
# Server crashed when one used USER() function in connection for which
# was impossible to obtain peer hostname.
connect (con1, 127.0.0.1, root, , test, $MASTER_MYPORT, );
--replace_column 1 #
-select user();
+SELECT USER();
# We are only interested in the fact that statement below doesn't
# crash server.
--disable_result_log
-show processlist;
+SHOW PROCESSLIST;
--enable_result_log
connection default;
+disconnect con1;
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
+