summaryrefslogtreecommitdiff
path: root/mysql-test/r/read_only.result
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.local>2006-12-12 23:22:46 +0300
committerunknown <kostja@bodhi.local>2006-12-12 23:22:46 +0300
commitf19d9b41cd41f941f228cafd025f04f213ee2a94 (patch)
treee0d27e22f258ef1f553dbe4846a3c27efa676969 /mysql-test/r/read_only.result
parentfabf58c6cc475e0d3837f94b5e345d8be059d248 (diff)
downloadmariadb-git-f19d9b41cd41f941f228cafd025f04f213ee2a94.tar.gz
Post-merge fixes.
mysql-test/r/read_only.result: A post-merge fix: update results. server-tools/instance-manager/guardian.cc: Remove initialization of a non-existent member.
Diffstat (limited to 'mysql-test/r/read_only.result')
-rw-r--r--mysql-test/r/read_only.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result
index d479fdb4c3c..f270f1ed5ad 100644
--- a/mysql-test/r/read_only.result
+++ b/mysql-test/r/read_only.result
@@ -89,11 +89,11 @@ select @@global.read_only;
@@global.read_only
1
unlock tables;
-set global read_only=0;
drop temporary table ttt;
ERROR 42S02: Unknown table 'ttt'
drop temporary table if exists ttt;
Warnings:
Note 1051 Unknown table 'ttt'
+set global read_only=0;
drop table t1,t2;
drop user test@localhost;