bzr commit into mysql-pe branch (staale.smedseng:3362)

[Staale Smedseng]

#At file:///export/home/tmp/ss156133/z/45387-pe/ based on revid:bernt.johnsen@stripped

 3362 Staale Smedseng	2009-06-15 [merge]
      Merge from 5.1-bugteam

    modified:
      mysql-test/r/log_tables_debug.result
      mysql-test/t/log_tables_debug.test
=== modified file 'mysql-test/r/log_tables_debug.result'
--- a/mysql-test/r/log_tables_debug.result	2009-06-12 14:28:10 +0000
+++ b/mysql-test/r/log_tables_debug.result	2009-06-15 16:03:25 +0000
@@ -9,9 +9,10 @@ SET @old_slow_query_log_file= @@global.s
 SET @@global.general_log = ON;
 SET @@global.general_log_file = 'bug45387_general.log';
 SET SESSION debug='+d,reset_log_last_time';
+FLUSH LOGS;
 SET @@global.general_log = @old_general_log;
 SET @@global.general_log_file = @old_general_log_file;
-SET SESSION debug='';
+SET SESSION debug='-d,reset_log_last_time';
 Bug#45387: ID match.
 End of 5.1 tests
 #

=== modified file 'mysql-test/t/log_tables_debug.test'
--- a/mysql-test/t/log_tables_debug.test	2009-06-12 14:41:09 +0000
+++ b/mysql-test/t/log_tables_debug.test	2009-06-15 16:04:39 +0000
@@ -28,11 +28,12 @@ SET @@global.general_log_file = 'bug4538
 SET SESSION debug='+d,reset_log_last_time';
 
 let CONN_ID= `SELECT CONNECTION_ID()`;
+FLUSH LOGS;
 
 # reset log settings
 SET @@global.general_log = @old_general_log;
 SET @@global.general_log_file = @old_general_log_file;
-SET SESSION debug='';
+SET SESSION debug='-d,reset_log_last_time';
 
 perl;
   # get the relevant info from the surrounding perl invocation
@@ -48,14 +49,20 @@ perl;
       break;
     }
   }
-  close(FILE);
 
   # print the result
   if ($found == $conn_id) {
     print "Bug#45387: ID match.\n";
   } else {
     print "Bug#45387: Expected ID '$conn_id', found '$found' in log file.\n";
-  }
+    print "Contents of log file:\n";
+    seek(FILE, 0, 0);
+    while($line= <FILE>) {
+      print $line;
+    }
+  }   
+
+  close(FILE);
 EOF
 
 --remove_file $MYSQLD_DATADIR/bug45387_general.log


Attachment: [text/bzr-bundle] bzr/[e-mail]