mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Bug #45387 Information about statement id for prepared
statements missed from general log A FLUSH LOGS is added to ensure that the log info hits the file before attempting to process.
This commit is contained in:
parent
a964a71119
commit
81b5a391b0
2 changed files with 12 additions and 4 deletions
|
@ -9,9 +9,10 @@ SET @old_slow_query_log_file= @@global.slow_query_log_file;
|
|||
SET @@global.general_log = ON;
|
||||
SET @@global.general_log_file = 'bug45387_general.log';
|
||||
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='';
|
||||
SET SESSION debug='-d,reset_log_last_time';
|
||||
Bug#45387: ID match.
|
||||
End of 5.1 tests
|
||||
#
|
||||
|
|
|
@ -32,11 +32,12 @@ SET @@global.general_log_file = 'bug45387_general.log';
|
|||
SET SESSION debug='+d,reset_log_last_time';
|
||||
|
||||
let CONN_ID= `SELECT CONNECTION_ID()`;
|
||||
FLUSH LOGS;
|
||||
|
||||
# reset log settings
|
||||
SET @@global.general_log = @old_general_log;
|
||||
SET @@global.general_log_file = @old_general_log_file;
|
||||
SET SESSION debug='';
|
||||
SET SESSION debug='-d,reset_log_last_time';
|
||||
|
||||
perl;
|
||||
# get the relevant info from the surrounding perl invocation
|
||||
|
@ -52,14 +53,20 @@ perl;
|
|||
break;
|
||||
}
|
||||
}
|
||||
close(FILE);
|
||||
|
||||
# print the result
|
||||
if ($found == $conn_id) {
|
||||
print "Bug#45387: ID match.\n";
|
||||
} else {
|
||||
print "Bug#45387: Expected ID '$conn_id', found '$found' in log file.\n";
|
||||
}
|
||||
print "Contents of log file:\n";
|
||||
seek(FILE, 0, 0);
|
||||
while($line= <FILE>) {
|
||||
print $line;
|
||||
}
|
||||
}
|
||||
|
||||
close(FILE);
|
||||
EOF
|
||||
|
||||
--remove_file $MYSQLD_DATADIR/bug45387_general.log
|
||||
|
|
Loading…
Reference in a new issue