Commit cebad07c authored by Davi Arnaut's avatar Davi Arnaut

Disable session debugging after its not necessary anymore.

mysql-test/t/log_tables_debug.test:
  Remove spurious spaces and disable session debugging.
parent 37a5f2d4
...@@ -18,7 +18,7 @@ SET @old_slow_query_log_file= @@global.slow_query_log_file; ...@@ -18,7 +18,7 @@ SET @old_slow_query_log_file= @@global.slow_query_log_file;
--echo # --echo #
--echo # Bug#45387 Information about statement id for prepared --echo # Bug#45387 Information about statement id for prepared
--echo # statements missed from general log --echo # statements missed from general log
--echo # --echo #
...@@ -28,7 +28,7 @@ let MYSQLD_DATADIR= `SELECT @@datadir`; ...@@ -28,7 +28,7 @@ let MYSQLD_DATADIR= `SELECT @@datadir`;
SET @@global.general_log = ON; SET @@global.general_log = ON;
SET @@global.general_log_file = 'bug45387_general.log'; 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'; SET SESSION debug='+d,reset_log_last_time';
let CONN_ID= `SELECT CONNECTION_ID()`; let CONN_ID= `SELECT CONNECTION_ID()`;
...@@ -37,7 +37,7 @@ FLUSH LOGS; ...@@ -37,7 +37,7 @@ FLUSH LOGS;
# reset log settings # reset log settings
SET @@global.general_log = @old_general_log; SET @@global.general_log = @old_general_log;
SET @@global.general_log_file = @old_general_log_file; SET @@global.general_log_file = @old_general_log_file;
SET SESSION debug='-d,reset_log_last_time'; SET SESSION debug='-d';
perl; perl;
# get the relevant info from the surrounding perl invocation # get the relevant info from the surrounding perl invocation
...@@ -45,7 +45,7 @@ perl; ...@@ -45,7 +45,7 @@ perl;
$conn_id= $ENV{'CONN_ID'}; $conn_id= $ENV{'CONN_ID'};
# loop through the log file looking for the stmt querying for conn id # loop through the log file looking for the stmt querying for conn id
open(FILE, "$datadir/bug45387_general.log") or open(FILE, "$datadir/bug45387_general.log") or
die("Unable to read log file $datadir/bug45387_general.log: $!\n"); die("Unable to read log file $datadir/bug45387_general.log: $!\n");
while(<FILE>) { while(<FILE>) {
if (/\d{6} \d\d:\d\d:\d\d[ \t]+(\d+)[ \t]+Query[ \t]+SELECT CONNECTION_ID/) { if (/\d{6} \d\d:\d\d:\d\d[ \t]+(\d+)[ \t]+Query[ \t]+SELECT CONNECTION_ID/) {
...@@ -64,7 +64,7 @@ perl; ...@@ -64,7 +64,7 @@ perl;
while($line= <FILE>) { while($line= <FILE>) {
print $line; print $line;
} }
} }
close(FILE); close(FILE);
EOF EOF
...@@ -92,4 +92,3 @@ if(!$fixed_bug38124) ...@@ -92,4 +92,3 @@ if(!$fixed_bug38124)
eval SET @@global.slow_query_log_file = '$my_var'; eval SET @@global.slow_query_log_file = '$my_var';
--enable_query_log --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