From 6bfa2a01b58a289ea89a49a584412dae6d073c8e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Dec 2007 09:48:13 -0200 Subject: Bug#32996 log_tables.test fails sporadically Only select entries from the general_log that were issued by the current connection. mysql-test/r/log_tables.result: Update test result. mysql-test/t/log_tables.test: Only select entries from the current thread. --- mysql-test/r/log_tables.result | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mysql-test/r/log_tables.result') diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index a31f2047670..0a7634df85a 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -605,6 +605,7 @@ DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`; DROP DATABASE IF EXISTS `db_17876`; SET GLOBAL general_log = @old_general_log_state; SET GLOBAL slow_query_log = @old_slow_log_state; +select CONNECTION_ID() into @thread_id; truncate table mysql.general_log; set @old_general_log_state = @@global.general_log; set global general_log = on; @@ -711,7 +712,7 @@ set @lparam = "000 001 002 003 004 005 006 007 008 009" prepare long_query from "select ? as long_query"; execute long_query using @lparam; set global general_log = off; -select command_type, argument from mysql.general_log; +select command_type, argument from mysql.general_log where thread_id = @thread_id; command_type argument Query set @lparam = "000 001 002 003 004 005 006 007 008 009" "010 011 012 013 014 015 016 017 018 019" -- cgit v1.2.1