summaryrefslogtreecommitdiff
path: root/mysql-test/t/log_state.test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-01-30 13:52:26 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-01-30 13:52:26 +0200
commit6e501e6548f15d3450ffb122ba1e683f40a4c917 (patch)
tree62763e5b2b8fc594a6350438d3424ff872a91c85 /mysql-test/t/log_state.test
parent721e412854cc701b9a23c0a3ca2b84c936877bc2 (diff)
downloadmariadb-git-6e501e6548f15d3450ffb122ba1e683f40a4c917.tar.gz
Fixed problems detected by pushbuild
mysql-test/t/log_state.test: Move disconnect last to avoid sporadic failures in test because 'Quit' command appeared in general log plugin/daemon_example/daemon_example.c: Define __attribute__ to fix compiler error with not gcc compilers sql-common/client.c: Fixed spelling error sql/sql_parse.cc: Added comment
Diffstat (limited to 'mysql-test/t/log_state.test')
-rw-r--r--mysql-test/t/log_state.test6
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test
index 6fc0f3421a7..e16256d48df 100644
--- a/mysql-test/t/log_state.test
+++ b/mysql-test/t/log_state.test
@@ -37,7 +37,6 @@ set session long_query_time=1;
select sleep(2);
--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
select * from mysql.slow_log;
-disconnect con1;
connection default;
show global variables
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
@@ -121,3 +120,8 @@ drop table t1;
select * from mysql.general_log;
--enable_ps_protocol
+
+#
+# Cleanup (must be done last to avoid delayed 'Quit' message in general log)
+#
+disconnect con1;