Skip to content

Commit e436481

Browse files
MDEV-37810 Fixup spider test combinations
This is a fixup of 41725b4 where the symlinks were incorrectly created using absolute paths. Also fix ps protocol for spider/bugfix.mdev_29502,usual_handler
1 parent 85567ab commit e436481

File tree

6 files changed

+29
-5
lines changed

6 files changed

+29
-5
lines changed

storage/spider/mysql-test/spider/bg/combinations

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[group_by_handler]
2+
loose_spider_disable_group_by_handler=0
3+
4+
[usual_handler]
5+
loose_spider_disable_group_by_handler=1

storage/spider/mysql-test/spider/bugfix/combinations

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[group_by_handler]
2+
loose_spider_disable_group_by_handler=0
3+
4+
[usual_handler]
5+
loose_spider_disable_group_by_handler=1

storage/spider/mysql-test/spider/bugfix/t/mdev_29502.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ set spider_direct_aggregate=1;
2121

2222
eval CREATE TABLE t1 (a INT KEY) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "$srv",TABLE "t"';
2323

24+
--disable_ps2_protocol
2425
SELECT MAX(a) FROM t1;
2526
SELECT SUM(a) FROM t1;
2627
SELECT COUNT(a) FROM t1;
@@ -32,6 +33,7 @@ SELECT COUNT(a), MAX(a), SUM(a) FROM t1;
3233
SELECT MAX(a), COUNT(a), SUM(a) FROM t1;
3334
SELECT MAX(a), MAX(COALESCE(a)) FROM t1;
3435
--enable_view_protocol
36+
--enable_ps2_protocol
3537
SHOW STATUS LIKE 'Spider_direct_aggregate';
3638

3739
DROP TABLE t, t1;
@@ -41,7 +43,9 @@ INSERT INTO t VALUES (23, -1),(48, 97);
4143

4244
eval CREATE TABLE t1 (a INT, b INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "$srv",TABLE "t"';
4345

46+
--disable_ps2_protocol
4447
SELECT MAX(a + b), SUM(a - b) FROM t1;
48+
--enable_ps2_protocol
4549
SHOW STATUS LIKE 'Spider_direct_aggregate';
4650

4751
DROP TABLE t, t1;

storage/spider/mysql-test/spider/feature/combinations

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[group_by_handler]
2+
loose_spider_disable_group_by_handler=0
3+
4+
[usual_handler]
5+
loose_spider_disable_group_by_handler=1

storage/spider/mysql-test/spider/regression/e1121/combinations

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[group_by_handler]
2+
loose_spider_disable_group_by_handler=0
3+
4+
[usual_handler]
5+
loose_spider_disable_group_by_handler=1

storage/spider/mysql-test/spider/regression/e112122/combinations

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)