From 3cc3aa7d70ccffe701f378a6a9f21b1ee02dabc2 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Mon, 15 Jun 2009 20:27:27 -0300 Subject: Post-merge fix: modify regular expression to better handle 24 hour times (ie: 2:16:20). mysql-test/r/log_tables_debug.result: Update test case result. mysql-test/t/log_tables_debug.test: Skip spaces and handle case when a leading zero is not printed. --- mysql-test/r/log_tables_debug.result | 4 ++-- mysql-test/t/log_tables_debug.test | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/log_tables_debug.result b/mysql-test/r/log_tables_debug.result index 16d8eed136f..daedb8c103a 100644 --- a/mysql-test/r/log_tables_debug.result +++ b/mysql-test/r/log_tables_debug.result @@ -3,7 +3,7 @@ SET @old_general_log_file= @@global.general_log_file; SET @old_slow_query_log= @@global.slow_query_log; SET @old_slow_query_log_file= @@global.slow_query_log_file; # -# Bug#45387 Information about statement id for prepared +# Bug#45387 Information about statement id for prepared # statements missed from general log # SET @@global.general_log = ON; @@ -12,7 +12,7 @@ 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='-d,reset_log_last_time'; +SET SESSION debug='-d'; Bug#45387: ID match. End of 5.1 tests # diff --git a/mysql-test/t/log_tables_debug.test b/mysql-test/t/log_tables_debug.test index 09b024643da..19a62614608 100644 --- a/mysql-test/t/log_tables_debug.test +++ b/mysql-test/t/log_tables_debug.test @@ -48,7 +48,7 @@ perl; open(FILE, "$datadir/bug45387_general.log") or die("Unable to read log file $datadir/bug45387_general.log: $!\n"); while() { - if (/\d{6} \d\d:\d\d:\d\d[ \t]+(\d+)[ \t]+Query[ \t]+SELECT CONNECTION_ID/) { + if (/\d{6}\s+\d+:\d+:\d+[ \t]+(\d+)[ \t]+Query[ \t]+SELECT CONNECTION_ID/) { $found= $1; break; } -- cgit v1.2.1