diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2020-09-15 23:24:52 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2020-09-15 23:24:52 +0900 |
| commit | 1723d3cf915b1bd74632401a1a9768c8e8572d00 (patch) | |
| tree | 62be5a9687bd73ad3ac12b2b99bc86da27871caf | |
| parent | 2bac9782aa81ad386beaf00eb126ccf2d15031a1 (diff) | |
| download | mariadb-git-bb-10.5-ps-ks.tar.gz | |
Fix Spider tests for executing with --ps optionbb-10.5-ps-ks
7 files changed, 7 insertions, 1 deletions
diff --git a/storage/spider/mysql-test/spider/bugfix/r/wrapper_mariadb.result b/storage/spider/mysql-test/spider/bugfix/r/wrapper_mariadb.result index 7c01421fa13..aa9e4b5de05 100644 --- a/storage/spider/mysql-test/spider/bugfix/r/wrapper_mariadb.result +++ b/storage/spider/mysql-test/spider/bugfix/r/wrapper_mariadb.result @@ -47,7 +47,7 @@ pkey connection child2_1; SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'; argument -select t0.`pkey` `pkey` from `auto_test_remote`.`tbl_a` t0 order by `pkey` +select `pkey` `pkey` from `auto_test_remote`.`tbl_a` order by `pkey` SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %' SELECT pkey FROM tbl_a ORDER BY pkey; pkey diff --git a/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.test b/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.test index c687f947a91..7fbf3bee04e 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.test +++ b/storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.test @@ -1,3 +1,4 @@ +--source include/no_protocol.inc --source ../include/delete_with_float_column_mysql_init.inc --source delete_with_float_column.inc --source ../include/delete_with_float_column_mysql_deinit.inc diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test index be4aa6a6330..d30793b49e6 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_21884.test @@ -1,3 +1,4 @@ +--source include/no_protocol.inc --source ../include/mdev_21884_init.inc --echo --echo this test is for MDEV-21884 diff --git a/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test b/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test index 0102155b5ab..c08d4025709 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test +++ b/storage/spider/mysql-test/spider/bugfix/t/wrapper_mariadb.test @@ -49,6 +49,7 @@ TRUNCATE TABLE mysql.general_log; SELECT * FROM tbl_a ORDER BY pkey; --connection child2_1 +--replace_regex /t0.// eval $CHILD2_1_SELECT_ARGUMENT1; eval $CHILD2_1_SELECT_TABLES; 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..22c5528bacb 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 @@ -1,3 +1,4 @@ +--source include/no_protocol.inc --source ../include/direct_join_by_pkey_key_init.inc --echo --echo this test is for MDEV-18995 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..3b7541da737 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 @@ -1,3 +1,4 @@ +--source include/no_protocol.inc --source ../include/direct_join_by_pkey_pkey_init.inc --echo --echo this test is for MDEV-18995 diff --git a/storage/spider/mysql-test/spider/t/partition_mrr.test b/storage/spider/mysql-test/spider/t/partition_mrr.test index e7fedce33e6..2816d65cadb 100644 --- a/storage/spider/mysql-test/spider/t/partition_mrr.test +++ b/storage/spider/mysql-test/spider/t/partition_mrr.test @@ -1,3 +1,4 @@ +--source include/no_protocol.inc --source ../include/partition_mrr_init.inc if (!$HAVE_PARTITION) { |