mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
fix spider tests for --ps
spider tests use --let $var= many;sql;statements --eval $var and this doesn't work in ps
This commit is contained in:
parent
a5f6eca50d
commit
068246c006
4 changed files with 11 additions and 0 deletions
storage/spider/mysql-test/spider
|
@ -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;
|
||||
|
||||
|
@ -66,7 +68,9 @@ SELECT a, b, c FROM tbl_a PARTITION (pt2,pt3);
|
|||
|
||||
--connection child2_1
|
||||
eval $CHILD2_1_SELECT_ARGUMENT1;
|
||||
--disable_ps_protocol
|
||||
eval $CHILD2_1_SELECT_TABLES;
|
||||
--enable_ps_protocol
|
||||
|
||||
--echo
|
||||
--echo deinit
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
@ -78,7 +80,9 @@ SELECT STRAIGHT_JOIN b.a, b.b FROM tb_l a, tbl_a b WHERE a.a = b.a;
|
|||
--connection child2_1
|
||||
SET NAMES utf8;
|
||||
eval $CHILD2_1_SELECT_ARGUMENT1;
|
||||
--disable_ps_protocol
|
||||
eval $CHILD2_1_SELECT_TABLES;
|
||||
--enable_ps_protocol
|
||||
|
||||
--echo
|
||||
--echo deinit
|
||||
|
|
|
@ -49,6 +49,8 @@ TRUNCATE TABLE mysql.general_log;
|
|||
SELECT * FROM tbl_a ORDER BY pkey;
|
||||
|
||||
--connection child2_1
|
||||
# in --ps a query is logged differently in a general log
|
||||
replace_regex /order by t0.`pkey`/order by `pkey`/;
|
||||
eval $CHILD2_1_SELECT_ARGUMENT1;
|
||||
eval $CHILD2_1_SELECT_TABLES;
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
--source include/no_protocol.inc
|
||||
--source ../include/partition_mrr_init.inc
|
||||
if (!$HAVE_PARTITION)
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue