summaryrefslogtreecommitdiff
path: root/mysql-test/include/deadlock.inc
diff options
context:
space:
mode:
authorLena Startseva <lena.startseva@mariadb.com>2022-06-09 10:32:51 +0700
committerLena Startseva <lena.startseva@mariadb.com>2022-09-23 17:36:20 +0700
commit72ba96a48eb3e99a967e0489cc79f378e865e3fd (patch)
treed68b640bd3b6f71c4c7e13967776a13aa29965a2 /mysql-test/include/deadlock.inc
parent1dd6255ffef901dddcff2191ddf975a2019799d9 (diff)
downloadmariadb-git-72ba96a48eb3e99a967e0489cc79f378e865e3fd.tar.gz
MDEV-27691: make working view-protocol
Tests with checking metadata or that cannot be run with the view-protocol are excluded from --view-protocol. For tests that do not allow the use of an additional connection, the util connection is disabled with "--disable_service_connection". Also cases with bugs for --view-protocol are disabled.
Diffstat (limited to 'mysql-test/include/deadlock.inc')
-rw-r--r--mysql-test/include/deadlock.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/include/deadlock.inc b/mysql-test/include/deadlock.inc
index 2fa61f48624..aa714445448 100644
--- a/mysql-test/include/deadlock.inc
+++ b/mysql-test/include/deadlock.inc
@@ -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