mirror of
https://github.com/MariaDB/server.git
synced 2025-12-03 05:41:09 +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:
@@ -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