diff options
| author | unknown <davi@endora.local> | 2007-12-05 11:25:51 -0200 |
|---|---|---|
| committer | unknown <davi@endora.local> | 2007-12-05 11:25:51 -0200 |
| commit | b5f919ddfa3bfe6202302bb3e88e252c68550ed7 (patch) | |
| tree | 147cf7a720edf3a65e048b7cf1d182dbdb8d421a | |
| parent | d2698c35e383a9ca16af7b98bcd5e8b925afeea7 (diff) | |
| parent | 6bfa2a01b58a289ea89a49a584412dae6d073c8e (diff) | |
| download | mariadb-git-b5f919ddfa3bfe6202302bb3e88e252c68550ed7.tar.gz | |
Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
| -rw-r--r-- | mysql-test/r/log_tables.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/log_tables.test | 3 |
2 files changed, 4 insertions, 2 deletions
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" diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test index f02138fb30b..0c986c6d63a 100644 --- a/mysql-test/t/log_tables.test +++ b/mysql-test/t/log_tables.test @@ -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; |