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 /sql/sql_partition.cc | |
| 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 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 71e5185012c..509a4d65964 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1982,6 +1982,9 @@ static int add_partition_options(File fptr, partition_element *p_elem) } if (p_elem->part_comment) err+= add_keyword_string(fptr, "COMMENT", TRUE, p_elem->part_comment); + if (p_elem->connect_string.length) + err+= add_keyword_string(fptr, "CONNECTION", TRUE, + p_elem->connect_string.str); return err + add_engine(fptr,p_elem->engine_type); } |