Browse Source

MDEV-36441 MDEV-35452 Fix extra spider_same_server_link warnings in view-protocol

With --view-protocol, mtr transforms a SELECT query to two queries:

1. CREATE OR REPLACE VIEW mysqltest_tmp_v AS ...
2. SELECT * FROM mysqltest_tmp_v

where ... is the original query. Further mtr may run the first query
in a separate connection.

On the other hand if the data node is the same as the spider node,
spider_same_server_link is required for connection to the data node.

Therefore, for mtr --view-protocol tests often spider_same_server_link
needs to be set on both session and global levels. In this patch we
add the missing "SET GLOBAL spider_same_server_link=1" queries to
tests that fail with wrong results due to this issue.

It does not fix --view-protocol for all the affected tests, because
there are other issues fixed in subsequent patches.
bb-10.5-mdev-36442
Yuchen Pei 6 months ago
parent
commit
866c06ac2d
No known key found for this signature in database GPG Key ID: 3DD1B35105743563
  1. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_26345.result
  2. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_29002.result
  3. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_29163.result
  4. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_29502.result
  5. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_29962.result
  6. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_30392.result
  7. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_30408.result
  8. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_31338.result
  9. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_31645.result
  10. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_34003.result
  11. 1
      storage/spider/mysql-test/spider/bugfix/r/mdev_35874.result
  12. 1
      storage/spider/mysql-test/spider/bugfix/r/subquery.result
  13. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_26345.test
  14. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_29002.test
  15. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_29163.test
  16. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_29502.test
  17. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_29962.test
  18. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_30392.test
  19. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_30408.test
  20. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_31338.test
  21. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_31645.test
  22. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_34003.test
  23. 1
      storage/spider/mysql-test/spider/bugfix/t/mdev_35874.test
  24. 1
      storage/spider/mysql-test/spider/bugfix/t/subquery.test

1
storage/spider/mysql-test/spider/bugfix/r/mdev_26345.result

@ -5,6 +5,7 @@ for child3
MDEV-26345 SELECT MIN on Spider table returns more rows than expected
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
create table t2 (a int, b int, PRIMARY KEY (a, b));

1
storage/spider/mysql-test/spider/bugfix/r/mdev_29002.result

@ -2,6 +2,7 @@ for master_1
for child2
for child3
SET spider_same_server_link= on;
SET global spider_same_server_link= on;
CREATE SERVER s FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t (a INT);

1
storage/spider/mysql-test/spider/bugfix/r/mdev_29163.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link=1;
set global spider_same_server_link=1;
CREATE SERVER s FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t1 (a INT);
CREATE TABLE t2 (b INT);

1
storage/spider/mysql-test/spider/bugfix/r/mdev_29502.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link=1;
set global spider_same_server_link=1;
CREATE SERVER $srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t (a INT);
INSERT INTO t VALUES (23),(48);

1
storage/spider/mysql-test/spider/bugfix/r/mdev_29962.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t (c INT) ENGINE=InnoDB;

1
storage/spider/mysql-test/spider/bugfix/r/mdev_30392.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link=1;
set global spider_same_server_link=1;
CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2);

1
storage/spider/mysql-test/spider/bugfix/r/mdev_30408.result

@ -3,6 +3,7 @@ for child2
for child3
set @@optimizer_switch="semijoin=off";
set spider_same_server_link= 1;
set global spider_same_server_link=1;
CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
create table ten(a int primary key);

1
storage/spider/mysql-test/spider/bugfix/r/mdev_31338.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link=1;
set global spider_same_server_link=1;
CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t (c BLOB) ENGINE=InnoDB;
CREATE TABLE ts (c BLOB) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';

1
storage/spider/mysql-test/spider/bugfix/r/mdev_31645.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link=1;
set global spider_same_server_link=1;
CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t1 ( a bigint(20) NOT NULL, b bigint(20) DEFAULT 0, PRIMARY KEY (a));
CREATE TABLE t2 ( a bigint(20) NOT NULL, b bigint(20) DEFAULT 0, PRIMARY KEY (a)) ENGINE=SPIDER COMMENT='srv "srv", WRAPPER "mysql", TABLE "t1"';

1
storage/spider/mysql-test/spider/bugfix/r/mdev_34003.result

@ -2,6 +2,7 @@ for master_1
for child2
for child3
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
create table t2 (c INT KEY,c1 BLOB,c2 TEXT) ENGINE=InnoDB;

1
storage/spider/mysql-test/spider/bugfix/r/mdev_35874.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t1 (c6 decimal(6,0)) ENGINE=InnoDB;

1
storage/spider/mysql-test/spider/bugfix/r/subquery.result

@ -5,6 +5,7 @@ for master_1
for child2
for child3
set spider_same_server_link=1;
set global spider_same_server_link=1;
CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
create table t1 (c1 int);
create table t2 (c2 int);

1
storage/spider/mysql-test/spider/bugfix/t/mdev_26345.test

@ -11,6 +11,7 @@
--echo
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29002.test

@ -4,6 +4,7 @@
--enable_result_log
--enable_query_log
SET spider_same_server_link= on;
SET global spider_same_server_link= on;
evalp CREATE SERVER s FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29163.test

@ -7,6 +7,7 @@
--enable_result_log
--enable_query_log
set spider_same_server_link=1;
set global spider_same_server_link=1;
evalp CREATE SERVER s FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t1 (a INT);

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

@ -9,6 +9,7 @@
--enable_query_log
set spider_same_server_link=1;
set global spider_same_server_link=1;
--let $srv=srv_mdev_29502
evalp CREATE SERVER $srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');

1
storage/spider/mysql-test/spider/bugfix/t/mdev_29962.test

@ -8,6 +8,7 @@
--enable_query_log
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');

1
storage/spider/mysql-test/spider/bugfix/t/mdev_30392.test

@ -7,6 +7,7 @@
--enable_result_log
--enable_query_log
set spider_same_server_link=1;
set global spider_same_server_link=1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t1 (a INT);

1
storage/spider/mysql-test/spider/bugfix/t/mdev_30408.test

@ -6,6 +6,7 @@
set @@optimizer_switch="semijoin=off";
set spider_same_server_link= 1;
set global spider_same_server_link=1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');

1
storage/spider/mysql-test/spider/bugfix/t/mdev_31338.test

@ -10,6 +10,7 @@
--enable_query_log
set spider_same_server_link=1;
set global spider_same_server_link=1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t (c BLOB) ENGINE=InnoDB;
CREATE TABLE ts (c BLOB) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"';

1
storage/spider/mysql-test/spider/bugfix/t/mdev_31645.test

@ -7,6 +7,7 @@
--enable_result_log
--enable_query_log
set spider_same_server_link=1;
set global spider_same_server_link=1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
CREATE TABLE t1 ( a bigint(20) NOT NULL, b bigint(20) DEFAULT 0, PRIMARY KEY (a));

1
storage/spider/mysql-test/spider/bugfix/t/mdev_34003.test

@ -4,6 +4,7 @@
--enable_result_log
--enable_query_log
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
create table t2 (c INT KEY,c1 BLOB,c2 TEXT) ENGINE=InnoDB;

1
storage/spider/mysql-test/spider/bugfix/t/mdev_35874.test

@ -9,6 +9,7 @@
--enable_query_log
--source include/have_innodb.inc
set spider_same_server_link= 1;
set global spider_same_server_link= 1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');

1
storage/spider/mysql-test/spider/bugfix/t/subquery.test

@ -7,6 +7,7 @@
--enable_result_log
--enable_query_log
set spider_same_server_link=1;
set global spider_same_server_link=1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
create table t1 (c1 int);
create table t2 (c2 int);

Loading…
Cancel
Save