List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:December 17 2009 2:34pm
Subject:bzr commit into mysql-5.0-bugteam branch (aelkin:2825) Bug#49740
View as plain text  
#At file:///home/andrei/MySQL/BZR/mysql-5.0-bugteam/ based on revid:satya.bn@stripped

 2825 Andrei Elkin	2009-12-17
      Bug #49740  rpl.rpl_temporary fails in PB2 in mysql-trunk-merge
      
      The test allowed random coincidence of connection ids for two concurrent
      sessions performing CREATE/DROP temp tables.
      
      Fixed with correcting the test. The sessions connection ids are not changed
      from their defaults anymore.

    modified:
      mysql-test/r/rpl_temporary.result
      mysql-test/t/rpl_temporary.test
=== modified file 'mysql-test/r/rpl_temporary.result'
--- a/mysql-test/r/rpl_temporary.result	2009-05-22 23:15:21 +0000
+++ b/mysql-test/r/rpl_temporary.result	2009-12-17 14:34:11 +0000
@@ -16,8 +16,10 @@ ERROR 42000: Access denied; you need the
 SELECT @@session.sql_select_limit = @save_select_limit;
 @@session.sql_select_limit = @save_select_limit
 1
+SET @save_conn_id= connection_id();
 SET @@session.pseudo_thread_id=100;
 SET @@session.pseudo_thread_id=connection_id();
+SET @@session.pseudo_thread_id=@save_conn_id;
 SET @@session.sql_log_bin=0;
 SET @@session.sql_log_bin=1;
 drop table if exists t1,t2;

=== modified file 'mysql-test/t/rpl_temporary.test'
--- a/mysql-test/t/rpl_temporary.test	2009-05-22 23:15:21 +0000
+++ b/mysql-test/t/rpl_temporary.test	2009-12-17 14:34:11 +0000
@@ -41,8 +41,10 @@ SET @@session.sql_select_limit=10, @@ses
 SELECT @@session.sql_select_limit = @save_select_limit; #shouldn't have changed
 # Now as root, to be sure it works
 connection con2;
+SET @save_conn_id= connection_id();
 SET @@session.pseudo_thread_id=100;
 SET @@session.pseudo_thread_id=connection_id();
+SET @@session.pseudo_thread_id=@save_conn_id;
 SET @@session.sql_log_bin=0;
 SET @@session.sql_log_bin=1;
 


Attachment: [text/bzr-bundle] bzr/aelkin@mysql.com-20091217143411-0h95s80ykl33so5d.bundle
Thread
bzr commit into mysql-5.0-bugteam branch (aelkin:2825) Bug#49740Andrei Elkin17 Dec
  • Re: bzr commit into mysql-5.0-bugteam branch (aelkin:2825) Bug#49740Luís Soares17 Dec