summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/innodb_mysql_lock.result2
-rw-r--r--mysql-test/r/lock_sync.result120
-rw-r--r--mysql-test/r/lock_tables_lost_commit.result1
-rw-r--r--mysql-test/r/mdl_sync.result250
-rw-r--r--mysql-test/r/partition_debug_sync.result26
-rw-r--r--mysql-test/r/partition_explicit_prune.result12
-rw-r--r--mysql-test/r/truncate_coverage.result42
7 files changed, 45 insertions, 408 deletions
diff --git a/mysql-test/r/innodb_mysql_lock.result b/mysql-test/r/innodb_mysql_lock.result
index a7f45d355f1..6d2eef2e62e 100644
--- a/mysql-test/r/innodb_mysql_lock.result
+++ b/mysql-test/r/innodb_mysql_lock.result
@@ -95,8 +95,6 @@ LOCK TABLES t1 READ;
SELECT release_lock('bug42147_lock');
release_lock('bug42147_lock')
1
-connection default;
-connection con2;
UNLOCK TABLES;
connection default;
disconnect con2;
diff --git a/mysql-test/r/lock_sync.result b/mysql-test/r/lock_sync.result
index f075262c3db..5eae1af7982 100644
--- a/mysql-test/r/lock_sync.result
+++ b/mysql-test/r/lock_sync.result
@@ -338,6 +338,7 @@ Success: 'load data infile '../../std_data/rpl_loaddata.dat' into table t2 (@a,
# 2.8 REPLACE with a subquery.
#
# Same is true for this statement as well.
+# Suppress warnings for REPLACE ... SELECT
connection default;
Success: 'replace into t2 select i+5 from t1' doesn't allow concurrent inserts into 't1'.
connection default;
@@ -704,87 +705,6 @@ disconnect con1;
disconnect con2;
set @@global.concurrent_insert= @old_concurrent_insert;
#
-# Test for bug #45143 "All connections hang on concurrent ALTER TABLE".
-#
-# Concurrent execution of statements which required weak write lock
-# (TL_WRITE_ALLOW_WRITE) on several instances of the same table and
-# statements which tried to acquire stronger write lock (TL_WRITE,
-# TL_WRITE_ALLOW_READ) on this table might have led to deadlock.
-drop table if exists t1;
-drop view if exists v1;
-# Create auxiliary connections used through the test.
-connect con_bug45143_1,localhost,root,,test,,;
-connect con_bug45143_3,localhost,root,,test,,;
-connect con_bug45143_2,localhost,root,,test,,;
-connection default;
-# Reset DEBUG_SYNC facility before using it.
-set debug_sync= 'RESET';
-# Turn off logging so calls to locking subsystem performed
-# for general_log table won't interfere with our test.
-set @old_general_log = @@global.general_log;
-set @@global.general_log= OFF;
-create table t1 (i int) engine=InnoDB;
-# We have to use view in order to make LOCK TABLES avoid
-# acquiring SNRW metadata lock on table.
-create view v1 as select * from t1;
-insert into t1 values (1);
-# Prepare user lock which will be used for resuming execution of
-# the first statement after it acquires TL_WRITE_ALLOW_WRITE lock.
-select get_lock("lock_bug45143_wait", 0);
-get_lock("lock_bug45143_wait", 0)
-1
-connection con_bug45143_1;
-# Sending:
-insert into t1 values (get_lock("lock_bug45143_wait", 100));;
-connection con_bug45143_2;
-# Wait until the above INSERT takes TL_WRITE_ALLOW_WRITE lock on 't1'
-# and then gets blocked on user lock 'lock_bug45143_wait'.
-# Ensure that upcoming SELECT waits after acquiring TL_WRITE_ALLOW_WRITE
-# lock for the first instance of 't1'.
-set debug_sync='thr_multi_lock_after_thr_lock SIGNAL parked WAIT_FOR go';
-# Sending:
-select count(*) > 0 from t1 as a, t1 as b for update;;
-connection con_bug45143_3;
-# Wait until the above SELECT ... FOR UPDATE is blocked after
-# acquiring lock for the the first instance of 't1'.
-set debug_sync= 'now WAIT_FOR parked';
-# Send LOCK TABLE statement which will try to get TL_WRITE lock on 't1':
-lock table v1 write;;
-connection default;
-# Wait until this LOCK TABLES statement starts waiting for table lock.
-# Allow SELECT ... FOR UPDATE to resume.
-# Since it already has TL_WRITE_ALLOW_WRITE lock on the first instance
-# of 't1' it should be able to get lock on the second instance without
-# waiting, even although there is another thread which has such lock
-# on this table and also there is a thread waiting for a TL_WRITE on it.
-set debug_sync= 'now SIGNAL go';
-connection con_bug45143_2;
-# Reap SELECT ... FOR UPDATE
-count(*) > 0
-1
-connection default;
-# Resume execution of the INSERT statement.
-select release_lock("lock_bug45143_wait");
-release_lock("lock_bug45143_wait")
-1
-connection con_bug45143_1;
-# Reap INSERT statement.
-# In Statement and Mixed replication mode we get here "Unsafe
-# for binlog" warnings. In row mode there are no warnings.
-# Hide the discrepancy.
-connection con_bug45143_3;
-# Reap LOCK TABLES statement.
-unlock tables;
-connection default;
-# Do clean-up.
-disconnect con_bug45143_1;
-disconnect con_bug45143_2;
-disconnect con_bug45143_3;
-set debug_sync= 'RESET';
-set @@global.general_log= @old_general_log;
-drop view v1;
-drop table t1;
-#
# Bug#50821 Deadlock between LOCK TABLES and ALTER TABLE
#
DROP TABLE IF EXISTS t1, t2;
@@ -827,44 +747,6 @@ connection default;
DROP EVENT e2;
SET DEBUG_SYNC="RESET";
#
-# Bug#55930 Assertion `thd->transaction.stmt.is_empty() ||
-# thd->in_sub_stmt || (thd->state..
-#
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1(a INT) engine=InnoDB;
-INSERT INTO t1 VALUES (1), (2);
-connect con1, localhost, root;
-connect con2, localhost, root;
-connection con1;
-SET SESSION lock_wait_timeout= 1;
-SET DEBUG_SYNC= 'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze';
-# Sending:
-OPTIMIZE TABLE t1;
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
-SET DEBUG_SYNC= 'after_lock_tables_takes_lock SIGNAL thrlock WAIT_FOR release_thrlock';
-# Sending:
-INSERT INTO t1 VALUES (3);
-connection default;
-SET DEBUG_SYNC= 'now WAIT_FOR thrlock';
-SET DEBUG_SYNC= 'now SIGNAL opti_analyze';
-connection con1;
-# Reaping: OPTIMIZE TABLE t1
-Table Op Msg_type Msg_text
-test.t1 optimize note Table does not support optimize, doing recreate + analyze instead
-test.t1 optimize error Lock wait timeout exceeded; try restarting transaction
-test.t1 optimize status Operation failed
-Warnings:
-Error 1205 Lock wait timeout exceeded; try restarting transaction
-SET DEBUG_SYNC= 'now SIGNAL release_thrlock';
-disconnect con1;
-connection con2;
-# Reaping: INSERT INTO t1 VALUES (3)
-disconnect con2;
-connection default;
-DROP TABLE t1;
-SET DEBUG_SYNC= 'RESET';
-#
# Bug#57130 crash in Item_field::print during SHOW CREATE TABLE or VIEW
#
DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/r/lock_tables_lost_commit.result b/mysql-test/r/lock_tables_lost_commit.result
index 769e9734c7a..394ef0a9d1c 100644
--- a/mysql-test/r/lock_tables_lost_commit.result
+++ b/mysql-test/r/lock_tables_lost_commit.result
@@ -9,7 +9,6 @@ disconnect con1;
connection con2;
SELECT * FROM t1;
a
-10
DROP TABLE t1;
connection default;
disconnect con2;
diff --git a/mysql-test/r/mdl_sync.result b/mysql-test/r/mdl_sync.result
index 865e874f63e..1e285650c77 100644
--- a/mysql-test/r/mdl_sync.result
+++ b/mysql-test/r/mdl_sync.result
@@ -76,10 +76,6 @@ ERROR 42000: Key column 'not_exist' doesn't exist in table
# lock.
alter table t1 add primary key (c1);
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-# Check that SNRW lock is compatible with S lock.
-lock table t1 write;
-insert into t1 values (1);
-unlock tables;
# Check that X lock is incompatible with S lock.
# Sending:
rename table t1 to t2;;
@@ -117,29 +113,6 @@ connection mdl_con1;
alter table t1 drop column c2;
#
connection default;
-handler t1 open;
-#
-connection mdl_con1;
-# Check that upgrade from SNRW to X is blocked by presence of S lock.
-lock table t1 write;
-# Sending:
-alter table t1 add column c2 int;;
-#
-connection mdl_con2;
-# Check that the above upgrade of SNRW to X in ALTER TABLE is blocked
-# because of S lock.
-#
-connection default;
-# Unblock ALTER TABLE.
-handler t1 close;
-#
-connection mdl_con1;
-# Reaping ALTER TABLE.
-# Restore the original state of the things.
-alter table t1 drop column c2;
-unlock tables;
-#
-connection default;
#
# 2) Acquire SH (shared high-priority) lock on the table.
# We have to involve DEBUG_SYNC facility for this as usually
@@ -160,7 +133,7 @@ column_name
c1
select count(*) from t1;
count(*)
-3
+2
insert into t1 values (1);
# Check that SU lock is compatible with it. To do this use ALTER TABLE
# which will fail when constructing .frm and thus obtaining SU metadata
@@ -258,7 +231,7 @@ connection default;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection mdl_con1;
# Check that S, SH, SR and SW locks are compatible with it.
@@ -270,7 +243,7 @@ column_name
c1
select count(*) from t1;
count(*)
-3
+2
insert into t1 values (1);
# Check that SU lock is compatible with it. To do this use ALTER TABLE
# which will fail when constructing .frm and thus obtaining SU metadata
@@ -300,7 +273,7 @@ connection default;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection mdl_con1;
# Check that X lock is incompatible with SR lock.
@@ -323,7 +296,7 @@ connection default;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection mdl_con1;
# Check that upgrade from SNW to X is blocked by presence of SR lock.
@@ -453,7 +426,7 @@ column_name
c1
select count(*) from t1;
count(*)
-5
+4
delete from t1 limit 1;
# Check that SU lock is incompatible with SU lock.
# Sending:
@@ -549,7 +522,7 @@ column_name
c1
select count(*) from t1;
count(*)
-5
+4
# Check that SW lock is incompatible with SNW lock.
# Sending:
delete from t1 limit 2;;
@@ -658,8 +631,6 @@ lock table t1 write;
#
connection mdl_con1;
# Check that S and SH locks are compatible with it.
-handler t1 open;
-handler t1 close;
select column_name from information_schema.columns where
table_schema='test' and table_name='t1';
column_name
@@ -676,7 +647,7 @@ unlock tables;
connection mdl_con1;
# Reaping SELECT.
count(*)
-4
+3
#
connection default;
lock table t1 write;
@@ -847,7 +818,7 @@ ERROR 42S01: Table 't2' already exists
connection mdl_con1;
# Reaping SELECT.
count(*)
-4
+3
#
connection mdl_con2;
# Prepare for blocking RENAME TABLE.
@@ -996,7 +967,7 @@ column_name
c1
select count(*) from t1;
count(*)
-4
+3
# Check that SW is incompatible with pending SNW
# Sending:
delete from t1 limit 1;;
@@ -1025,7 +996,7 @@ connection mdl_con2;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection default;
# Add pending SNRW lock.
@@ -1035,8 +1006,6 @@ lock table t1 write;;
connection mdl_con1;
# Check that LOCK TABLE is waiting with pending SNRW lock.
# Check that S and SH locks are compatible with pending SNRW
-handler t1 open t;
-handler t close;
select column_name from information_schema.columns where
table_schema='test' and table_name='t1';
column_name
@@ -1057,14 +1026,14 @@ unlock tables;
connection mdl_con1;
# Reaping SELECT.
count(*)
-3
+2
# Restore pending SNRW lock.
#
connection mdl_con2;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection default;
# Sending:
@@ -1093,7 +1062,7 @@ connection mdl_con2;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection default;
# Sending:
@@ -1126,7 +1095,7 @@ connection mdl_con2;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection default;
# Add pending X lock.
@@ -1162,7 +1131,7 @@ connection mdl_con2;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection default;
# Add pending X lock.
@@ -1187,14 +1156,14 @@ ERROR 42S01: Table 't2' already exists
connection mdl_con1;
# Reaping SELECT.
count(*)
-4
+3
# Restore pending X lock.
#
connection mdl_con2;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection default;
# Add pending X lock.
@@ -1224,7 +1193,7 @@ connection mdl_con2;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection default;
# Add pending X lock.
@@ -1299,7 +1268,7 @@ connection default;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection mdl_con1;
# Create an active SNW lock on t2.
@@ -1321,7 +1290,7 @@ commit;
begin;
select count(*) from t1;
count(*)
-3
+2
# Sending:
insert into t2 values (1);;
#
@@ -1347,7 +1316,7 @@ commit;
begin;
select count(*) from t1;
count(*)
-3
+2
#
connection mdl_con1;
# Create an active SNW lock on t1.
@@ -1360,7 +1329,7 @@ set debug_sync= 'now WAIT_FOR locked';
# We should still be able to get SR lock without waiting.
select count(*) from t1;
count(*)
-3
+2
# Since the above ALTER TABLE is not upgrading SNW lock to X by waiting
# for SW lock we won't create deadlock.
# So the below INSERT should not end-up with ER_LOCK_DEADLOCK error.
@@ -1397,7 +1366,7 @@ connection default;
# We should still be able to get both SW and SR locks without waiting.
select count(*) from t1;
count(*)
-5
+4
delete from t1 limit 1;
# Unblock ALTER TABLE.
commit;
@@ -1416,7 +1385,7 @@ connection default;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con2;
# Start transaction which will prevent SNW -> X upgrade from
@@ -1454,7 +1423,7 @@ commit;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con2;
# Start transaction which will prevent SNW -> X upgrade from
@@ -1493,7 +1462,7 @@ commit;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con1;
# Create SNW lock pending upgrade to X.
@@ -1505,7 +1474,7 @@ connection default;
# Check that transaction is still able to acquire SR lock.
select count(*) from t1;
count(*)
-4
+3
# Waiting trying to acquire SW lock will cause deadlock and
# therefore should cause an error.
delete from t1 limit 1;
@@ -1526,7 +1495,7 @@ connection default;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con1;
lock table t2 write;
@@ -1551,7 +1520,7 @@ commit;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con1;
lock table t2 write;
@@ -1580,7 +1549,7 @@ commit;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con1;
# Sending:
@@ -1591,7 +1560,7 @@ connection default;
# Check that another instance of SR lock is granted without waiting.
select count(*) from t1;
count(*)
-4
+3
# Attempt to wait for SW lock will lead to deadlock, thus
# the below statement should end with ER_LOCK_DEADLOCK error.
delete from t1 limit 1;
@@ -1620,7 +1589,7 @@ connection default;
# and errors.
select count(*) from t1;
count(*)
-3
+2
insert into t1 values (1, 1);
# Unblock LOCK TABLES.
commit;
@@ -1639,7 +1608,7 @@ connection default;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con2;
# Start transaction which will prevent X lock from going away
@@ -1677,7 +1646,7 @@ rename table t3 to t2;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con2;
# Start transaction which will prevent X lock from going away
@@ -1721,7 +1690,7 @@ rename table t3 to t2;
begin;
select count(*) from t1;
count(*)
-4
+3
#
connection mdl_con1;
# Sending:
@@ -1732,7 +1701,7 @@ connection default;
# Check that another instance of SR lock is granted without waiting.
select count(*) from t1;
count(*)
-4
+3
# Attempt to wait for SW lock will lead to deadlock, thus
# the below statement should end with ER_LOCK_DEADLOCK error.
delete from t1 limit 1;
@@ -1761,7 +1730,7 @@ connection default;
# and errors.
select count(*) from t1;
count(*)
-3
+2
insert into t1 values (1, 1);
# Unblock RENAME TABLE.
commit;
@@ -1778,149 +1747,6 @@ disconnect mdl_con3;
set debug_sync= 'RESET';
drop table t1, t2;
#
-# Additional coverage for some scenarios in which not quite
-# correct use of S metadata locks by HANDLER statement might
-# have caused deadlocks.
-#
-drop table if exists t1, t2;
-connect handler_con1,localhost,root,,;
-connect handler_con2,localhost,root,,;
-connection default;
-create table t1 (i int);
-create table t2 (j int);
-insert into t1 values (1);
-#
-# First, check scenario in which we upgrade SNRW lock to X lock
-# on a table while having HANDLER READ trying to acquire TL_READ
-# on the same table.
-#
-handler t1 open;
-#
-connection handler_con1;
-lock table t1 write;
-# Upgrade SNRW to X lock.
-# Sending:
-alter table t1 add column j int;;
-#
-connection handler_con2;
-# Wait until ALTER is blocked during upgrade.
-#
-connection default;
-# The below statement should not cause deadlock.
-handler t1 read first;;
-#
-connection handler_con1;
-# Reap ALTER TABLE.
-unlock tables;
-#
-connection default;
-# Reap HANDLER READ.
-i j
-1 NULL
-handler t1 close;
-#
-# Now, check scenario in which upgrade of SNRW lock to X lock
-# can be blocked by HANDLER which is open in connection currently
-# waiting to get table-lock owned by connection doing upgrade.
-#
-handler t1 open;
-#
-connection handler_con1;
-lock table t1 write, t2 read;
-#
-connection default;
-# Execute statement which will be blocked on table-level lock
-# owned by connection 'handler_con1'.
-# Sending:
-insert into t2 values (1);;
-#
-connection handler_con1;
-# Wait until INSERT is blocked on table-level lock.
-# Sending 'alter table t1 drop column j'. It should not cause
-# deadlock.
-alter table t1 drop column j;
-connection handler_con2;
-# Wait until ALTER is blocked during upgrade.
-#
-connection default;
-# Reap INSERT.
-ERROR HY000: Wait on a lock was aborted due to a pending exclusive lock
-handler t1 close;
-#
-connection handler_con1;
-# Reaping 'alter table t1 drop column j'
-unlock tables;
-connection default;
-# Then, check the scenario in which upgrade of SNRW lock to X
-# lock is blocked by HANDLER which is open in connection currently
-# waiting to get SW lock on the same table.
-#
-handler t1 open;
-#
-connection handler_con1;
-lock table t1 write;
-#
-connection default;
-# The below insert should be blocked because active SNRW lock on 't1'.
-# Sending:
-insert into t1 values (1);;
-#
-connection handler_con1;
-# Wait until INSERT is blocked because of SNRW lock.
-# The below ALTER TABLE will be blocked because of presence of HANDLER.
-# Sending:
-alter table t1 add column j int;;
-#
-connection default;
-# INSERT should be chosen as victim for resolving deadlock.
-# Reaping INSERT.
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-# Close HANDLER to unblock ALTER TABLE.
-handler t1 close;
-#
-connection handler_con1;
-# Reaping ALTER TABLE.
-unlock tables;
-#
-connection default;
-#
-# Finally, test in which upgrade of SNRW lock to X lock is blocked
-# by HANDLER which is open in connection currently waiting to get
-# SR lock on the table on which lock is upgraded.
-#
-handler t1 open;
-#
-connection handler_con1;
-lock table t1 write, t2 write;
-#
-connection default;
-# The below insert should be blocked because active SNRW lock on 't1'.
-# Sending:
-insert into t2 values (1);;
-#
-connection handler_con1;
-# Wait until INSERT is blocked because of SNRW lock.
-# The below ALTER TABLE will be blocked because of presence of HANDLER.
-# Sending:
-alter table t1 drop column j;;
-#
-connection default;
-# INSERT should be chosen as victim for resolving deadlock.
-# Reaping INSERT.
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-# Close HANDLER to unblock ALTER TABLE.
-handler t1 close;
-#
-connection handler_con1;
-# Reaping ALTER TABLE.
-unlock tables;
-#
-connection default;
-# Clean-up.
-disconnect handler_con1;
-disconnect handler_con2;
-drop tables t1, t2;
-#
# Test coverage for basic deadlock detection in metadata
# locking subsystem.
#
diff --git a/mysql-test/r/partition_debug_sync.result b/mysql-test/r/partition_debug_sync.result
index 971bc63e2e7..b79385686b7 100644
--- a/mysql-test/r/partition_debug_sync.result
+++ b/mysql-test/r/partition_debug_sync.result
@@ -64,29 +64,3 @@ disconnect con1;
connection default;
SET DEBUG_SYNC= 'RESET';
End of 5.1 tests
-#
-# Coverage test for non pruned ha_partition::store_lock()
-#
-CREATE TABLE t1 (a int) ENGINE = InnoDB;
-CREATE TABLE t2 (a int PRIMARY KEY)
-ENGINE = InnoDB PARTITION BY HASH (a) PARTITIONS 3;
-HANDLER t1 OPEN;
-connect con1, localhost, root,,;
-LOCK TABLES t1 WRITE, t2 READ;
-connection default;
-SET DEBUG_SYNC="wait_for_lock SIGNAL locking";
-INSERT INTO t2 VALUES (1), (2), (3);
-connection con1;
-SET DEBUG_SYNC="now WAIT_FOR locking";
-ALTER TABLE t1 ADD COLUMN b int;
-connection default;
-ERROR HY000: Wait on a lock was aborted due to a pending exclusive lock
-SELECT 1;
-1
-1
-connection con1;
-UNLOCK TABLES;
-disconnect con1;
-connection default;
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE t1, t2;
diff --git a/mysql-test/r/partition_explicit_prune.result b/mysql-test/r/partition_explicit_prune.result
index 0cf9bde225c..1272ff8c5fc 100644
--- a/mysql-test/r/partition_explicit_prune.result
+++ b/mysql-test/r/partition_explicit_prune.result
@@ -281,7 +281,7 @@ UNLOCK TABLES;
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
VARIABLE_NAME VARIABLE_VALUE
-HANDLER_COMMIT 2
+HANDLER_COMMIT 3
HANDLER_READ_RND_NEXT 54
HANDLER_TMP_WRITE 75
HANDLER_WRITE 2
@@ -440,7 +440,7 @@ UNLOCK TABLES;
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
VARIABLE_NAME VARIABLE_VALUE
-HANDLER_COMMIT 5
+HANDLER_COMMIT 6
HANDLER_READ_FIRST 3
HANDLER_READ_NEXT 4
HANDLER_READ_RND_NEXT 108
@@ -665,7 +665,7 @@ UNLOCK TABLES;
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
VARIABLE_NAME VARIABLE_VALUE
-HANDLER_COMMIT 5
+HANDLER_COMMIT 6
HANDLER_DELETE 2
HANDLER_READ_FIRST 1
HANDLER_READ_KEY 3
@@ -758,7 +758,7 @@ UNLOCK TABLES;
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
VARIABLE_NAME VARIABLE_VALUE
-HANDLER_COMMIT 2
+HANDLER_COMMIT 3
HANDLER_READ_RND_NEXT 54
HANDLER_TMP_WRITE 75
HANDLER_WRITE 10
@@ -953,7 +953,7 @@ UNLOCK TABLES;
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
VARIABLE_NAME VARIABLE_VALUE
-HANDLER_COMMIT 3
+HANDLER_COMMIT 4
HANDLER_DELETE 1
HANDLER_READ_KEY 2
HANDLER_READ_RND 2
@@ -1039,7 +1039,7 @@ UNLOCK TABLES;
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
VARIABLE_NAME VARIABLE_VALUE
-HANDLER_COMMIT 3
+HANDLER_COMMIT 4
HANDLER_DELETE 2
HANDLER_READ_KEY 3
HANDLER_READ_NEXT 1
diff --git a/mysql-test/r/truncate_coverage.result b/mysql-test/r/truncate_coverage.result
index 95e649912e5..078de1ef3ab 100644
--- a/mysql-test/r/truncate_coverage.result
+++ b/mysql-test/r/truncate_coverage.result
@@ -6,48 +6,6 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 INT);
INSERT INTO t1 VALUES (1);
connect con1, localhost, root,,;
-HANDLER t1 OPEN;
-connection default;
-LOCK TABLE t1 WRITE;
-SET DEBUG_SYNC='mdl_upgrade_lock SIGNAL waiting';
-TRUNCATE TABLE t1;
-connect con2, localhost, root,,;
-SET DEBUG_SYNC='now WAIT_FOR waiting';
-KILL QUERY @id;
-disconnect con2;
-connection default;
-ERROR 70100: Query execution was interrupted
-UNLOCK TABLES;
-connection con1;
-# Release shared metadata lock by closing HANDLER.
-HANDLER t1 CLOSE;
-disconnect con1;
-connection default;
-DROP TABLE t1;
-SET DEBUG_SYNC='RESET';
-CREATE TABLE t1 (c1 INT);
-INSERT INTO t1 VALUES (1);
-connect con1, localhost, root,,;
-HANDLER t1 OPEN;
-connection default;
-LOCK TABLE t1 WRITE;
-SET DEBUG_SYNC='mdl_upgrade_lock SIGNAL waiting';
-TRUNCATE TABLE t1;
-connect con2, localhost, root,,;
-SET DEBUG_SYNC='now WAIT_FOR waiting';
-disconnect con2;
-connection con1;
-HANDLER t1 CLOSE;
-disconnect con1;
-connection default;
-ERROR 42S02: Table 'test.t1' doesn't exist
-UNLOCK TABLES;
-DROP TABLE t1;
-ERROR 42S02: Unknown table 'test.t1'
-SET DEBUG_SYNC='RESET';
-CREATE TABLE t1 (c1 INT);
-INSERT INTO t1 VALUES (1);
-connect con1, localhost, root,,;
START TRANSACTION;
INSERT INTO t1 VALUES (2);
connection default;
View Lorry Controller Status