summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-06-19 13:45:39 +0200
committerSergei Golubchik <serg@mariadb.org>2021-06-19 13:46:11 +0200
commit690ae1de45943b549ca792862d6de03fdfb5f923 (patch)
tree0510f747f7d48749c5d22cc051afb22ce9c6b5e7 /storage
parenta4f485917e4ec18a00280fad3aca87856a62aa70 (diff)
downloadmariadb-git-690ae1de45943b549ca792862d6de03fdfb5f923.tar.gz
fix spider tests for --ps in 10.4
see also 068246c006b
Diffstat (limited to 'storage')
-rw-r--r--storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test4
-rw-r--r--storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test4
2 files changed, 8 insertions, 0 deletions
diff --git a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test
index e915a21fd4a..39b5b5535bb 100644
--- a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test
+++ b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_key.test
@@ -21,8 +21,10 @@ USE auto_test_remote;
--connection child2_1
--disable_query_log
+--disable_ps_protocol
echo CHILD2_1_CREATE_TABLES;
eval $CHILD2_1_CREATE_TABLES;
+--enable_ps_protocol
--enable_query_log
TRUNCATE TABLE mysql.general_log;
@@ -62,8 +64,10 @@ TRUNCATE TABLE mysql.general_log;
SELECT a.val, a.akey FROM tbl_a a, tbl_b b WHERE a.akey = b.akey AND b.bkey = 5;
--connection child2_1
+--disable_ps_protocol
eval $CHILD2_1_SELECT_ARGUMENT1;
eval $CHILD2_1_SELECT_TABLES;
+--enable_ps_protocol
--echo
--echo deinit
diff --git a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test
index dcd6e3a4535..652f7d15177 100644
--- a/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test
+++ b/storage/spider/mysql-test/spider/regression/e1121/t/direct_join_by_pkey_pkey.test
@@ -22,7 +22,9 @@ USE auto_test_remote;
--connection child2_1
--disable_query_log
echo CHILD2_1_CREATE_TABLES;
+--disable_ps_protocol
eval $CHILD2_1_CREATE_TABLES;
+--enable_ps_protocol
--enable_query_log
TRUNCATE TABLE mysql.general_log;
@@ -62,8 +64,10 @@ TRUNCATE TABLE mysql.general_log;
SELECT a.val, a.akey FROM tbl_a a, tbl_b b WHERE a.akey = b.akey AND b.bkey = 5;
--connection child2_1
+--disable_ps_protocol
eval $CHILD2_1_SELECT_ARGUMENT1;
eval $CHILD2_1_SELECT_TABLES;
+--enable_ps_protocol
--echo
--echo deinit