summaryrefslogtreecommitdiff
path: root/mysql-test/t/log_tables-big.test
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2017-08-15 20:10:04 +0300
committerElena Stepanova <elenst@montyprogram.com>2017-08-15 20:10:04 +0300
commite866e4cdbe974a83d4a4ee474d28f61e7082700f (patch)
tree858e4bc9f7010ad566f0a2d9692ec2270a56c323 /mysql-test/t/log_tables-big.test
parent0739179857699d68758ff2e56e9414735546ded6 (diff)
downloadmariadb-git-e866e4cdbe974a83d4a4ee474d28f61e7082700f.tar.gz
MTR's internal check of main.log_tables-big failed
The test wasn't restoring log_output properly. Also added output of query_time in case of wrong result, to investigate the failure described in MDEV-13408
Diffstat (limited to 'mysql-test/t/log_tables-big.test')
-rw-r--r--mysql-test/t/log_tables-big.test9
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/t/log_tables-big.test b/mysql-test/t/log_tables-big.test
index 8936a163d73..fa8810ecd3b 100644
--- a/mysql-test/t/log_tables-big.test
+++ b/mysql-test/t/log_tables-big.test
@@ -7,6 +7,7 @@
# check that CSV engine was compiled in
--source include/have_csv.inc
+set @log_output.saved = @@global.log_output;
set @@global.log_output = 'TABLE';
connect (con1,localhost,root,,);
@@ -21,13 +22,13 @@ select get_lock('bug27638', 1);
connection con2;
set session long_query_time=1;
select get_lock('bug27638', 2);
-select if (query_time >= '00:00:01', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:00:01', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 2)';
select get_lock('bug27638', 60);
-select if (query_time >= '00:00:59', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:00:59', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 60)';
select get_lock('bug27638', 101);
-select if (query_time >= '00:01:40', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:01:40', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 101)';
connection con1;
select release_lock('bug27638');
@@ -36,4 +37,4 @@ connection default;
disconnect con1;
disconnect con2;
-set @@global.log_output=default;
+set @@global.log_output = @log_output.saved;