summaryrefslogtreecommitdiff
path: root/mysql-test/r/status.result
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-10-16 13:43:16 +0500
committerunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-10-16 13:43:16 +0500
commit620269fecf2590d6e359221a5349360ad5cb9dc3 (patch)
treec9d1ca672dd812f6e37a4bc781eb5607dd0183dd /mysql-test/r/status.result
parent8b7ee0d67aa1d43b229b10b56c5a9362571c5802 (diff)
downloadmariadb-git-620269fecf2590d6e359221a5349360ad5cb9dc3.tar.gz
Fix for bug #31285: main.status test fails with different Table_locks_waited
Problem: Table_locks_waited value may depend on general logging. Fix: switch general logging off. mysql-test/r/status.result: Fix for bug #31285: main.status test fails with different Table_locks_waited - switch general logging off. mysql-test/t/status.test: Fix for bug #31285: main.status test fails with different Table_locks_waited - switch general logging off.
Diffstat (limited to 'mysql-test/r/status.result')
-rw-r--r--mysql-test/r/status.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
index db75044ee5d..c95b09597fc 100644
--- a/mysql-test/r/status.result
+++ b/mysql-test/r/status.result
@@ -8,6 +8,8 @@ VARIABLE_NAME VARIABLE_VALUE
TABLE_LOCKS_IMMEDIATE 2
TABLE_LOCKS_WAITED 0
SET SQL_LOG_BIN=0;
+set @old_general_log = @@global.general_log;
+set global general_log = 'OFF';
drop table if exists t1;
create table t1(n int) engine=myisam;
insert into t1 values(1);
@@ -20,6 +22,7 @@ show status like 'Table_locks_waited';
Variable_name Value
Table_locks_waited 1
drop table t1;
+set global general_log = @old_general_log;
select 1;
1
1