diff options
| author | Monty <monty@mariadb.org> | 2016-12-05 13:04:47 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-03 13:58:34 +0200 |
| commit | d5268a610af093e1bf7c0fc2f0d1aabd040766ad (patch) | |
| tree | d07c09ab0406f57b90e2c6b12f17a7e21096d710 /mysql-test/suite/federated | |
| parent | 7abe11499ad0a0805a85fa2c82747b50f4702f08 (diff) | |
| download | mariadb-git-d5268a610af093e1bf7c0fc2f0d1aabd040766ad.tar.gz | |
MDEV-7700 Spiral patch 002_mariadb-10.0.15.spider.diff, part 2
Allow partition engines to access table->s->connect_string for engines
that uses HTON_CAN_READ_CONNECT_STRING_IN_PARTITION
Don't reset table->s->connect_string in ha_partition::open
Diffstat (limited to 'mysql-test/suite/federated')
| -rw-r--r-- | mysql-test/suite/federated/federated_partition.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/federated/federated_partition.test | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/federated/federated_partition.result b/mysql-test/suite/federated/federated_partition.result index a2d5fcffd9b..c8a61d825b6 100644 --- a/mysql-test/suite/federated/federated_partition.result +++ b/mysql-test/suite/federated/federated_partition.result @@ -10,7 +10,8 @@ create table federated.t1_1 (s1 int primary key) engine=myisam; create table federated.t1_2 (s1 int primary key) engine=innodb; connection master; create table t1 (s1 int primary key) engine=federated -partition by list (s1) +CONNECTION="remember_this" + partition by list (s1) (partition p1 values in (1,3) connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_1', partition p2 values in (2,4) @@ -20,7 +21,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `s1` int(11) NOT NULL, PRIMARY KEY (`s1`) -) ENGINE=FEDERATED DEFAULT CHARSET=latin1 +) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='remember_this' PARTITION BY LIST (`s1`) (PARTITION `p1` VALUES IN (1,3) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_1' ENGINE = FEDERATED, PARTITION `p2` VALUES IN (2,4) CONNECTION = 'mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2' ENGINE = FEDERATED) diff --git a/mysql-test/suite/federated/federated_partition.test b/mysql-test/suite/federated/federated_partition.test index ef1e27ec505..47110b5eebf 100644 --- a/mysql-test/suite/federated/federated_partition.test +++ b/mysql-test/suite/federated/federated_partition.test @@ -25,6 +25,7 @@ create table federated.t1_2 (s1 int primary key) engine=innodb; connection master; --replace_result $SLAVE_MYPORT SLAVE_PORT eval create table t1 (s1 int primary key) engine=federated + CONNECTION="remember_this" partition by list (s1) (partition p1 values in (1,3) connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1_1', |