diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-11 04:28:22 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-11 04:28:22 +0200 |
| commit | 55c55d85bd8fab635d038d77550f93fc996d47eb (patch) | |
| tree | 8b3083f5be550cc65701fba04a171fa92e817110 /mysql-test/suite/federated | |
| parent | 7e497abcfb3e761ba5a368316192ae930fb58f6b (diff) | |
| download | mariadb-git-55c55d85bd8fab635d038d77550f93fc996d47eb.tar.gz | |
Fixed bug in federatedx patch that caused partition tests to fail.
Fixed that connection string is returned for partitioned federated tables.
mysql-test/r/partition_federated.result:
Fixed error message
mysql-test/suite/federated/federated_partition.result:
Added test to show that connection string is returned in 'show create'.
sql/ha_partition.cc:
Fixed a set of bugs introduced by the last federated patch:
- We can't allocate m_ordered_rec_buffer in memroot as it has to survive call to clear_handler_file()
sql/partition_element.h:
Ensure that connect_string is properly initialized.
(This caused crashed in partition tests)
sql/sql_partition.cc:
Print CONNECTION option for federated partitioned tables
Diffstat (limited to 'mysql-test/suite/federated')
| -rw-r--r-- | mysql-test/suite/federated/federated_partition.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/federated/federated_partition.test | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/federated/federated_partition.result b/mysql-test/suite/federated/federated_partition.result index ebcafca4563..26a6443ffad 100644 --- a/mysql-test/suite/federated/federated_partition.result +++ b/mysql-test/suite/federated/federated_partition.result @@ -9,6 +9,15 @@ partition by list (s1) connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_1', partition p2 values in (2,4) connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1_2'); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `s1` int(11) NOT NULL, + PRIMARY KEY (`s1`) +) ENGINE=FEDERATED DEFAULT CHARSET=latin1 +/*!50100 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) */ insert into t1 values (1), (2), (3), (4); select * from t1; s1 diff --git a/mysql-test/suite/federated/federated_partition.test b/mysql-test/suite/federated/federated_partition.test index 223dab6af16..6f093bfb63d 100644 --- a/mysql-test/suite/federated/federated_partition.test +++ b/mysql-test/suite/federated/federated_partition.test @@ -30,6 +30,9 @@ eval create table t1 (s1 int primary key) engine=federated partition p2 values in (2,4) connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1_2'); +--replace_result $SLAVE_MYPORT SLAVE_PORT +show create table t1; + insert into t1 values (1), (2), (3), (4); select * from t1; |