database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-02 14:22:51 +03:00
Code Activity

Merge 11.0 into 11.1

Browse Source
This commit is contained in:
Marko Mäkelä
2024-03-28 12:15:36 +02:00
parent d3e4de529b fec2fd6add
commit 683fbced6b
727 changed files with 22650 additions and 8324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/innodb/r/innodb_mysql.result
View File

@ -431,10 +431,6 @@ a
connection con1;
begin work;
insert into t1 values (5);
select * from t1;
a
1
5
insert into t1 values (2);
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
select * from t1;
@ -509,10 +505,6 @@ a
connection con1;
begin work;
insert into t1 values (5);
select * from t1;
a
1
5
insert into t1 values (2);
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
select * from t1;
@ -1217,10 +1209,6 @@ a
connection con1;
begin work;
insert into t1 values (5);
select * from t1;
a
1
5
insert into t1 values (2);
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
select * from t1;