diff options
Diffstat (limited to 'mysql-test/suite/federated')
4 files changed, 49 insertions, 6 deletions
diff --git a/mysql-test/suite/federated/federated_server.result b/mysql-test/suite/federated/federated_server.result index 45616839b89..d25676e7ad5 100644 --- a/mysql-test/suite/federated/federated_server.result +++ b/mysql-test/suite/federated/federated_server.result @@ -212,7 +212,7 @@ connect conn_usage,127.0.0.1,guest_usage,,,$MASTER_MYPORT; connect conn_super,127.0.0.1,guest_super,,,$MASTER_MYPORT; connection conn_select; alter server s1 options (database 'db_bogus'); -ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the SUPER, FEDERATED ADMIN privilege(s) for this operation connection master; flush tables; select * from federated.t1; @@ -220,7 +220,7 @@ id name 1 this is legitimate connection conn_usage; alter server s1 options (database 'db_bogus'); -ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the SUPER, FEDERATED ADMIN privilege(s) for this operation connection master; flush tables; select * from federated.t1; @@ -234,7 +234,7 @@ select * from federated.t1; Got one of the listed errors connection conn_select; drop server if exists 's1'; -ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the SUPER, FEDERATED ADMIN privilege(s) for this operation create server 's1' foreign data wrapper 'mysql' options (HOST '127.0.0.1', DATABASE 'db_legitimate', @@ -243,7 +243,7 @@ PASSWORD 'foo', PORT SLAVE_PORT, SOCKET '', OWNER 'root'); -ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the SUPER, FEDERATED ADMIN privilege(s) for this operation connection conn_super; drop server 's1'; create server 's1' foreign data wrapper 'mysql' options diff --git a/mysql-test/suite/federated/federated_type_inet6.result b/mysql-test/suite/federated/federated_type_inet6.result new file mode 100644 index 00000000000..625a7f3353f --- /dev/null +++ b/mysql-test/suite/federated/federated_type_inet6.result @@ -0,0 +1,24 @@ +connect master,127.0.0.1,root,,test,$MASTER_MYPORT,; +connect slave,127.0.0.1,root,,test,$SLAVE_MYPORT,; +connection master; +CREATE DATABASE federated; +connection slave; +CREATE DATABASE federated; +# +# MDEV-20806 Federated does not work with INET6, returns NULL with warning ER_TRUNCATED_WRONG_VALUE +# +connection master; +CREATE TABLE t1 (a INET6); +INSERT INTO t1 VALUES ('::'),('f::f'); +CREATE TABLE t2 (a INET6) ENGINE=Federated CONNECTION='mysql://root@127.0.0.1:MASTER_PORT/test/t1'; +SELECT * FROM t2; +a +:: +f::f +DROP TABLE t1, t2; +connection master; +DROP TABLE IF EXISTS federated.t1; +DROP DATABASE IF EXISTS federated; +connection slave; +DROP TABLE IF EXISTS federated.t1; +DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/suite/federated/federated_type_inet6.test b/mysql-test/suite/federated/federated_type_inet6.test new file mode 100644 index 00000000000..857f0726689 --- /dev/null +++ b/mysql-test/suite/federated/federated_type_inet6.test @@ -0,0 +1,17 @@ +source include/federated.inc; + +--echo # +--echo # MDEV-20806 Federated does not work with INET6, returns NULL with warning ER_TRUNCATED_WRONG_VALUE +--echo # + +connection master; + +CREATE TABLE t1 (a INET6); +INSERT INTO t1 VALUES ('::'),('f::f'); + +--replace_result $MASTER_MYPORT MASTER_PORT +eval CREATE TABLE t2 (a INET6) ENGINE=Federated CONNECTION='mysql://root@127.0.0.1:$MASTER_MYPORT/test/t1'; +SELECT * FROM t2; +DROP TABLE t1, t2; + +source include/federated_cleanup.inc; diff --git a/mysql-test/suite/federated/federatedx_create_handlers.result b/mysql-test/suite/federated/federatedx_create_handlers.result index 65a9d52803f..90a5234a02f 100644 --- a/mysql-test/suite/federated/federatedx_create_handlers.result +++ b/mysql-test/suite/federated/federatedx_create_handlers.result @@ -228,7 +228,8 @@ ANALYZE "r_loops": 1, "rows": 7, "r_rows": 7, - "r_total_time_ms": "REPLACED", + "r_table_time_ms": "REPLACED", + "r_other_time_ms": "REPLACED", "filtered": 100, "r_filtered": 100 }, @@ -243,7 +244,8 @@ ANALYZE "r_loops": 7, "rows": 2, "r_rows": 0, - "r_total_time_ms": "REPLACED", + "r_table_time_ms": "REPLACED", + "r_other_time_ms": "REPLACED", "filtered": 100, "r_filtered": 100, "materialized": { |