database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-28 17:36:30 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Vlad Lesin
2022-03-07 18:42:47 +03:00
parent b6a2472489 0b92c7b0e0
commit 202316a38f
31 changed files with 275 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/versioning/r/update.result
View File

@@ -283,6 +283,7 @@ connection default;
update t1 set b = 'foo';
connection con1;
update t1 set a = 'bar';
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
disconnect con1;
connection default;
drop table t1;

4
mysql-test/suite/versioning/t/update.test
View File

@@ -186,9 +186,7 @@ send update t1 set b = 'foo';
connection con1;
let $wait_condition= select count(*) from information_schema.innodb_lock_waits;
source include/wait_condition.inc;
# There must no be DEADLOCK here as con1 transaction already holds locks, and
# default's transaction lock is waiting, so the locks of the following "UPDATE"
# must not conflict with waiting lock.
error ER_LOCK_DEADLOCK;
update t1 set a = 'bar';
disconnect con1;
connection default;