mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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.
This commit is contained in:
@ -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
|
||||
#
|
||||
|
@ -48,7 +48,7 @@ perl;
|
||||
open(FILE, "$datadir/bug45387_general.log") or
|
||||
die("Unable to read log file $datadir/bug45387_general.log: $!\n");
|
||||
while(<FILE>) {
|
||||
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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user