Bug#32996 log_tables.test fails sporadically
Only select entries from the general_log that were issued by the current connection.
This commit is contained in:
parent
af039c53f9
commit
b79b57c645
@ -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"
|
||||
|
@ -811,6 +811,7 @@ SET GLOBAL slow_query_log = @old_slow_log_state;
|
||||
# Bug#21557 entries in the general query log truncated at 1000 characters.
|
||||
#
|
||||
|
||||
select CONNECTION_ID() into @thread_id;
|
||||
truncate table mysql.general_log;
|
||||
set @old_general_log_state = @@global.general_log;
|
||||
set global general_log = on;
|
||||
@ -921,7 +922,7 @@ prepare long_query from "select ? as long_query";
|
||||
execute long_query using @lparam;
|
||||
--enable_result_log
|
||||
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;
|
||||
deallocate prepare long_query;
|
||||
set global general_log = @old_general_log_state;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user