summaryrefslogtreecommitdiff
path: root/mysql-test/t/read_only.test
diff options
context:
space:
mode:
authorLeonard Zhou <leonard@mysql.com>2009-03-16 17:06:22 +0800
committerLeonard Zhou <leonard@mysql.com>2009-03-16 17:06:22 +0800
commit53849a24f97ad28a46dfb2a76a987676dda476fe (patch)
treeaa54713ea2cc67a7a6887c901cc613e25f7b8350 /mysql-test/t/read_only.test
parentb42c29cfe33b5c5aab33661357fa4eb309e86132 (diff)
parente0a1c593a6764603312e590c5ef320d5b2c6a9dd (diff)
downloadmariadb-git-53849a24f97ad28a46dfb2a76a987676dda476fe.tar.gz
Merge
Diffstat (limited to 'mysql-test/t/read_only.test')
-rw-r--r--mysql-test/t/read_only.test17
1 files changed, 11 insertions, 6 deletions
diff --git a/mysql-test/t/read_only.test b/mysql-test/t/read_only.test
index 5a498404b03..abc016bafce 100644
--- a/mysql-test/t/read_only.test
+++ b/mysql-test/t/read_only.test
@@ -3,10 +3,12 @@
# should work with embedded server after mysqltest is fixed
--source include/not_embedded.inc
---source include/count_sessions.inc
set @start_read_only= @@global.read_only;
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3;
--enable_warnings
@@ -110,7 +112,7 @@ drop table t1;
insert into t1 values(1);
#
-# BUG#11733: COMMITs should not happen if read-only is set
+# Bug#11733 COMMITs should not happen if read-only is set
#
# LOCK TABLE ... WRITE / READ_ONLY
@@ -238,8 +240,9 @@ set global read_only=1;
connection default;
select @@global.read_only;
unlock tables;
+disconnect root2;
-# BUG #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set"
+# Bug#22077 DROP TEMPORARY TABLE fails with wrong error if read_only is set
#
# check if DROP TEMPORARY on a non-existing temporary table returns the right
# error
@@ -256,10 +259,12 @@ drop temporary table if exists ttt;
--echo connection default;
connection default;
set global read_only=0;
+disconnect con1;
drop table t1,t2;
drop user test@localhost;
+
--echo #
---echo # Bug #27440 read_only allows create and drop database
+--echo # Bug#27440 read_only allows create and drop database
--echo #
set global read_only= 1;
--disable_warnings
@@ -297,7 +302,7 @@ delete from mysql.columns_priv where User like 'mysqltest_%';
flush privileges;
drop database mysqltest_db1;
set global read_only= @start_read_only;
-disconnect con1;
-disconnect root2;
+
+# Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc