summaryrefslogtreecommitdiff
path: root/mysql-test/r/status.result
diff options
context:
space:
mode:
authorunknown <tsmith@ramayana.hindu.god>2007-08-18 02:28:08 -0600
committerunknown <tsmith@ramayana.hindu.god>2007-08-18 02:28:08 -0600
commit0ece5608fc93d761387a0c081a255d06646a691a (patch)
tree1ca8add50658a1e53706c307897f1e981e51ec01 /mysql-test/r/status.result
parent994625d64fb3c349abc183d0f3a9ac6c8ba7625b (diff)
downloadmariadb-git-0ece5608fc93d761387a0c081a255d06646a691a.tar.gz
Bug #29307: status.test fails with different Table_locks_immediate
Finish premature patch which was accidentally pushed; remove debugging info and correct the test. mysql-test/r/status.result: Correct test results mysql-test/t/status.test: Disable query log for one statement, and correct some comments
Diffstat (limited to 'mysql-test/r/status.result')
-rw-r--r--mysql-test/r/status.result9
1 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
index 8f10625744b..0d49deb7cc8 100644
--- a/mysql-test/r/status.result
+++ b/mysql-test/r/status.result
@@ -16,14 +16,11 @@ unlock tables;
lock tables t1 read;
update t1 set n = 3;
unlock tables;
-show status like 'Table_lock%';
+show status like 'Table_locks_waited';
Variable_name Value
-Table_locks_immediate 17
Table_locks_waited 1
-select * from information_schema.session_status where variable_name like 'Table_lock%';
-VARIABLE_NAME VARIABLE_VALUE
-TABLE_LOCKS_IMMEDIATE 18
-TABLE_LOCKS_WAITED 1
+Immediate
+17
drop table t1;
select 1;
1