1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1

Browse Source 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
This commit is contained in:
davi@endora.local 2007-12-05 11:25:51 -02:00
commit aa5786eb0f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/log_tables.result
View File

@ -605,6 +605,7 @@ DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
DROP DATABASE IF EXISTS `db_17876`; DROP DATABASE IF EXISTS `db_17876`;
SET GLOBAL general_log = @old_general_log_state; SET GLOBAL general_log = @old_general_log_state;
SET GLOBAL slow_query_log = @old_slow_log_state; SET GLOBAL slow_query_log = @old_slow_log_state;
select CONNECTION_ID() into @thread_id;
truncate table mysql.general_log; truncate table mysql.general_log;
set @old_general_log_state = @@global.general_log; set @old_general_log_state = @@global.general_log;
set global general_log = on; 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"; prepare long_query from "select ? as long_query";
execute long_query using @lparam; execute long_query using @lparam;
set global general_log = off; 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 command_type argument
Query set @lparam = "000 001 002 003 004 005 006 007 008 009" Query set @lparam = "000 001 002 003 004 005 006 007 008 009"
"010 011 012 013 014 015 016 017 018 019" "010 011 012 013 014 015 016 017 018 019"

3
mysql-test/t/log_tables.test
View File

@ -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. # Bug#21557 entries in the general query log truncated at 1000 characters.
# #
select CONNECTION_ID() into @thread_id;
truncate table mysql.general_log; truncate table mysql.general_log;
set @old_general_log_state = @@global.general_log; set @old_general_log_state = @@global.general_log;
set global general_log = on; set global general_log = on;
@ -921,7 +922,7 @@ prepare long_query from "select ? as long_query";
execute long_query using @lparam; execute long_query using @lparam;
--enable_result_log --enable_result_log
set global general_log = off; 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; deallocate prepare long_query;
set global general_log = @old_general_log_state; set global general_log = @old_general_log_state;