summaryrefslogtreecommitdiff
path: root/sql/partition_element.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-11 04:28:22 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-11 04:28:22 +0200
commit55c55d85bd8fab635d038d77550f93fc996d47eb (patch)
tree8b3083f5be550cc65701fba04a171fa92e817110 /sql/partition_element.h
parent7e497abcfb3e761ba5a368316192ae930fb58f6b (diff)
downloadmariadb-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/partition_element.h')
-rw-r--r--sql/partition_element.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/partition_element.h b/sql/partition_element.h
index 2fe2bba74cd..2158063cfef 100644
--- a/sql/partition_element.h
+++ b/sql/partition_element.h
@@ -81,6 +81,8 @@ public:
nodegroup_id(UNDEF_NODEGROUP), has_null_value(FALSE),
signed_flag(FALSE), max_value(FALSE)
{
+ connect_string.str= 0;
+ connect_string.length= 0;
}
partition_element(partition_element *part_elem)
: part_max_rows(part_elem->part_max_rows),
@@ -95,6 +97,8 @@ public:
nodegroup_id(part_elem->nodegroup_id),
has_null_value(FALSE)
{
+ connect_string.str= 0;
+ connect_string.length= 0;
}
~partition_element() {}
};