revision-id: 17d00d9a94da2c2b57fc7cf75036d92ee6dc9298 (mariadb-10.3.6-134-g17d00d9) parent(s): 58b950737c547df42c82744029cbcad235e0efd9 author: Igor Babaev committer: Igor Babaev timestamp: 2019-02-12 14:00:48 -0800 message: MDEV-17096 Pushdown of simple derived tables to storage engines Made the setting of the system variable federated_pushdown at the default connection. --- mysql-test/suite/federated/federatedx_create_handlers.result | 3 +++ mysql-test/suite/federated/federatedx_create_handlers.test | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/federated/federatedx_create_handlers.result b/mysql-test/suite/federated/federatedx_create_handlers.result index a25b019..473972c 100644 --- a/mysql-test/suite/federated/federatedx_create_handlers.result +++ b/mysql-test/suite/federated/federatedx_create_handlers.result @@ -4,6 +4,8 @@ connection master; CREATE DATABASE federated; connection slave; CREATE DATABASE federated; +connection default; +set global federated_pushdown=1; connection slave; DROP TABLE IF EXISTS federated.t1; Warnings: @@ -301,6 +303,7 @@ DROP TABLE federated.t1, federated.t2, federated.t3; connection slave; DROP TABLE federated.t1, federated.t2; connection default; +set global federated_pushdown=0; connection master; DROP TABLE IF EXISTS federated.t1; DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/suite/federated/federatedx_create_handlers.test b/mysql-test/suite/federated/federatedx_create_handlers.test index 558b846..373b2aa 100644 --- a/mysql-test/suite/federated/federatedx_create_handlers.test +++ b/mysql-test/suite/federated/federatedx_create_handlers.test @@ -1,6 +1,8 @@ --source have_federatedx.inc --source include/federated.inc +connection default; + set global federated_pushdown=1; connection slave; @@ -153,6 +155,7 @@ DROP TABLE federated.t1, federated.t2; connection default; +set global federated_pushdown=0; + source include/federated_cleanup.inc; -set global federated_pushdown=0;