diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-05-20 04:30:38 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-05-23 19:51:34 +0300 |
| commit | d7d9b42370c9bba9ce1391af1f6891bda6834a3d (patch) | |
| tree | 84e1f455e36307e595ceb063c4aca4ef46ad2584 | |
| parent | 8ca32d7e700887c41fc4d96570af4ed0fb10a36d (diff) | |
| download | mariadb-git-d7d9b42370c9bba9ce1391af1f6891bda6834a3d.tar.gz | |
MDEV-12764 main.log_tables-big fails in buildbot due to connect_log
Additionally internal check was failing because the test did not
restore a global value properly
| -rw-r--r-- | mysql-test/r/log_tables-big.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/log_tables-big-master.opt | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/r/log_tables-big.result b/mysql-test/r/log_tables-big.result index 1e189a7726f..0a33510fe77 100644 --- a/mysql-test/r/log_tables-big.result +++ b/mysql-test/r/log_tables-big.result @@ -1,8 +1,12 @@ set @@global.log_output = 'TABLE'; +connect con1,localhost,root,,; +connect con2,localhost,root,,; +connection con1; set session long_query_time=10; select get_lock('bug27638', 1); get_lock('bug27638', 1) 1 +connection con2; set session long_query_time=1; select get_lock('bug27638', 2); get_lock('bug27638', 2) @@ -25,7 +29,11 @@ select if (query_time >= '00:01:40', 'OK', 'WRONG') as qt, sql_text from mysql.s where sql_text = 'select get_lock(\'bug27638\', 101)'; qt sql_text OK select get_lock('bug27638', 101) +connection con1; select release_lock('bug27638'); release_lock('bug27638') 1 +connection default; +disconnect con1; +disconnect con2; set @@global.log_output=default; diff --git a/mysql-test/t/log_tables-big-master.opt b/mysql-test/t/log_tables-big-master.opt index b9bc885d0e4..0cdf12d284b 100644 --- a/mysql-test/t/log_tables-big-master.opt +++ b/mysql-test/t/log_tables-big-master.opt @@ -1 +1 @@ ---log-output=table,file --slow-query-log --general-log --general-log-file="" --slow-query-log-file="" +--slow-query-log --general-log --general-log-file="" --slow-query-log-file="" |