Commit 2ec90aaf authored by Georgi Kodinov's avatar Georgi Kodinov

automerge

parents bdf67f14 1db058e6
......@@ -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
#
......
......@@ -28,7 +28,7 @@ let MYSQLD_DATADIR= `SELECT @@datadir`;
SET @@global.general_log = ON;
SET @@global.general_log_file = 'bug45387_general.log';
# turn on output of timestamps on all log file entries,
# turn on output of timestamps on all log file entries
SET SESSION debug='+d,reset_log_last_time';
let CONN_ID= `SELECT CONNECTION_ID()`;
......@@ -37,7 +37,7 @@ FLUSH LOGS;
# reset log settings
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';
perl;
# get the relevant info from the surrounding perl invocation
......@@ -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;
}
......@@ -92,4 +92,3 @@ if(!$fixed_bug38124)
eval SET @@global.slow_query_log_file = '$my_var';
--enable_query_log
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment