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

Merge branch 'bb-10.3-all-builders' into bb-10.4-all-builders

Browse Source
This commit is contained in:
Lena Startseva
2022-09-23 19:47:13 +07:00
parent 0c0a569028 72ba96a48e
commit 78dcf71e88
274 changed files with 1896 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/include/deadlock.inc
View File

@ -9,7 +9,7 @@
# old name was t/innodb-deadlock.test
# main code went into include/deadlock.inc
#
--disable_service_connection
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
@ -20,7 +20,7 @@ drop table if exists t1,t2;
#
# Testing of FOR UPDATE
#
--disable_view_protocol
connection con1;
eval create table t1 (id integer, x integer) engine = $engine_type;
insert into t1 values(0, 0);
@ -49,10 +49,11 @@ select * from t1;
commit;
drop table t1;
--enable_view_protocol
#
# Testing of FOR UPDATE
#
--disable_view_protocol
connection con1;
eval create table t1 (id integer, x integer) engine = $engine_type;
eval create table t2 (b integer, a integer) engine = $engine_type;
@ -125,7 +126,7 @@ connection default;
disconnect con1;
disconnect con2;
drop table t1, t2;
--enable_view_protocol
--echo End of 4.1 tests
#
@ -152,3 +153,4 @@ drop table if exists a;
set storage_engine=default;
--echo End of 5.0 tests.
--enable_service_connection