1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-14789 Creating federated table on versioned table fails

Browse Source 
don't allow to discover WITH SYSTEM VERSIONING clause

originally by: Aleksey Midenkov
This commit is contained in:
Sergei Golubchik 2018-02-15 13:31:22 +01:00
parent 5f6b3f9c07
commit 221d010f3e
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/federated/assisted_discovery.result
View File

@ -72,6 +72,14 @@ t1 CREATE TABLE `t1` (
drop table t1; drop table t1;
connection slave; connection slave;
drop table t1; drop table t1;
create or replace table t1 (x int) with system versioning;
connection master;
create table t1 engine=federated connection='mysql://root@127.0.0.1:SLAVE_MYPORT/test/t1';
ERROR HY000: Engine FEDERATED failed to discover table `test`.`t1` with 'CREATE TABLE `t1` (
`x` int(11) DEFAULT NULL
) WITH SYSTEM VERSIONING CONNECTION='mysql://root@127.0.0.1:SLAVE_MYPORT/test/t1''
connection slave;
drop table t1;
connection master; connection master;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated; DROP DATABASE IF EXISTS federated;

9
mysql-test/suite/federated/assisted_discovery.test
View File

@ -54,5 +54,14 @@ drop table t1;
connection slave; connection slave;
drop table t1; drop table t1;
create or replace table t1 (x int) with system versioning;
connection master;
--replace_result $SLAVE_MYPORT SLAVE_MYPORT
--error ER_SQL_DISCOVER_ERROR
eval create table t1 engine=federated connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t1';
connection slave;
drop table t1;
source include/federated_cleanup.inc; source include/federated_cleanup.inc;

3
sql/table.cc
View File

@ -2728,6 +2728,9 @@ static bool sql_unusable_for_discovery(THD *thd, handlerton *engine,
// ... engine // ... engine
if (create_info->db_type && create_info->db_type != engine) if (create_info->db_type && create_info->db_type != engine)
return 1; return 1;
// ... WITH SYSTEM VERSIONING
if (create_info->versioned())
return 1;
return 0; return 0;
} }