MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:December 5 2007 11:48am
Subject:bk commit into 5.1 tree (davi:1.2676) BUG#32996
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of davi. When davi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-05 09:48:13-02:00, davi@stripped +2 -0
  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@stripped, 2007-12-05 09:48:11-02:00, davi@stripped +2 -1
    Update test result.

  mysql-test/t/log_tables.test@stripped, 2007-12-05 09:48:11-02:00, davi@stripped +2 -1
    Only select entries from the current thread.

diff -Nrup a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
--- a/mysql-test/r/log_tables.result	2007-11-15 09:31:36 -02:00
+++ b/mysql-test/r/log_tables.result	2007-12-05 09:48:11 -02:00
@@ -605,6 +605,7 @@ DROP PROCEDURE IF EXISTS `db_17876.archi
 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 0
 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 -Nrup a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test
--- a/mysql-test/t/log_tables.test	2007-11-15 09:30:32 -02:00
+++ b/mysql-test/t/log_tables.test	2007-12-05 09:48:11 -02:00
@@ -811,6 +811,7 @@ SET GLOBAL slow_query_log = @old_slow_lo
 # 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 lon
 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;
 
Thread
bk commit into 5.1 tree (davi:1.2676) BUG#32996Davi Arnaut5 Dec
  • Re: bk commit into 5.1 tree (davi:1.2676) BUG#32996Alexander Nozdrin5 Dec