Commit e6d12bb4 authored by Yuchen Pei's avatar Yuchen Pei

MDEV-33661 MENT-1591 Fix spider/bugfix.mdev_28856 because of MDEV-29718.

The failure should be table not found, rather than no spider same
server link
parent 0b627377
...@@ -5,6 +5,8 @@ for master_1 ...@@ -5,6 +5,8 @@ for master_1
for child2 for child2
for child3 for child3
set spider_same_server_link=1; set spider_same_server_link=1;
set @old_spider_same_server_link=@@global.spider_same_server_link;
set global spider_same_server_link=1;
CREATE SERVER srv FOREIGN DATA WRAPPER mysql CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
# testing monitoring_* # testing monitoring_*
...@@ -173,6 +175,7 @@ max(d) ...@@ -173,6 +175,7 @@ max(d)
93 93
drop table t1, t2; drop table t1, t2;
drop server srv; drop server srv;
set global spider_same_server_link=@old_spider_same_server_link;
for master_1 for master_1
for child2 for child2
for child3 for child3
......
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
# This test covers some table params under consideration for inclusion # This test covers some table params under consideration for inclusion
# in the engine-defined options to be implemented in MDEV-28856. # in the engine-defined options to be implemented in MDEV-28856.
set spider_same_server_link=1; set spider_same_server_link=1;
set @old_spider_same_server_link=@@global.spider_same_server_link;
set global spider_same_server_link=1;
evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql
OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root');
...@@ -153,6 +156,7 @@ select max(d) from t1; ...@@ -153,6 +156,7 @@ select max(d) from t1;
drop table t1, t2; drop table t1, t2;
drop server srv; drop server srv;
set global spider_same_server_link=@old_spider_same_server_link;
--disable_query_log --disable_query_log
--disable_result_log --disable_result_log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment