diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
commit | d28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (patch) | |
tree | c6b9ab1d8193fa2a26c5e376d43e536abd3a47ce /mysql-test/suite/handler/heap.result | |
parent | ff485d2dc4d5adaf5eef0ccd03ce62adf3bd30b3 (diff) | |
parent | 6bf10fac445d73fb796d4863612c87bff5f28b66 (diff) | |
download | mariadb-git-d28d3ba40dc8ebef87199a2567ec96e9c5d744e2.tar.gz |
10.0-base merge
Diffstat (limited to 'mysql-test/suite/handler/heap.result')
-rw-r--r-- | mysql-test/suite/handler/heap.result | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result index 4b5af7afa72..527986edb5c 100644 --- a/mysql-test/suite/handler/heap.result +++ b/mysql-test/suite/handler/heap.result @@ -1044,8 +1044,7 @@ handler t1 close; # --> connection default # # Demonstrate that HANDLER locks and transaction locks -# reside in the same context, and we don't back-off -# when have transaction or handler locks. +# reside in the same context. # create table t1 (a int, key a (a)); insert into t1 (a) values (1), (2), (3), (4), (5); @@ -1065,10 +1064,16 @@ rename table t0 to t3, t1 to t0, t3 to t1; # --> connection con1 # Waiting for 'rename table ...' to get blocked... # --> connection default +# We back-off on hitting deadlock condition. handler t0 open; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction select * from t0; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +a +1 +2 +3 +4 +5 handler t1 open; commit; handler t1 close; |