diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-06-15 20:27:27 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-06-15 20:27:27 -0300 |
commit | 3cc3aa7d70ccffe701f378a6a9f21b1ee02dabc2 (patch) | |
tree | 75b2cbbbb4bf78705647ee6df646e5984dafc666 /mysql-test/t/log_tables_debug.test | |
parent | cebad07c5d1c0367b2e405f55baeb9e62422d095 (diff) | |
download | mariadb-git-3cc3aa7d70ccffe701f378a6a9f21b1ee02dabc2.tar.gz |
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.
Diffstat (limited to 'mysql-test/t/log_tables_debug.test')
-rw-r--r-- | mysql-test/t/log_tables_debug.test | 2 |
1 files changed, 1 insertions, 1 deletions
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(<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; } |