diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
| commit | 1387e71531495b1224bfafd6867ae5fae9cf469c (patch) | |
| tree | 6307410443d2eeee3817acf552e3ce583e9444d8 /sql/partition_element.h | |
| parent | 44db9c41b389a2eacdd9591f825ed86e9bffd0e8 (diff) | |
| download | mariadb-git-1387e71531495b1224bfafd6867ae5fae9cf469c.tar.gz | |
MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
merged from 5.6:
Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING
Bug#16589511: MYSQL_UPGRADE FAILS TO WRITE OUT ENTIRE ALTER TABLE ... ALGORITHM= ... STATEMENT
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN DOWNGRADED FROM 5.6.11 TO 5.6.10
plus minor changes from 5.6, mainly comments
Diffstat (limited to 'sql/partition_element.h')
| -rw-r--r-- | sql/partition_element.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/partition_element.h b/sql/partition_element.h index 4f03d91035a..d0a67c6af3e 100644 --- a/sql/partition_element.h +++ b/sql/partition_element.h @@ -115,12 +115,10 @@ public: partition_name(NULL), tablespace_name(NULL), log_entry(NULL), part_comment(NULL), data_file_name(NULL), index_file_name(NULL), - engine_type(NULL), part_state(PART_NORMAL), + engine_type(NULL), connect_string(null_lex_str), part_state(PART_NORMAL), 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), @@ -131,13 +129,11 @@ public: data_file_name(part_elem->data_file_name), index_file_name(part_elem->index_file_name), engine_type(part_elem->engine_type), - connect_string(part_elem->connect_string), + connect_string(null_lex_str), part_state(part_elem->part_state), nodegroup_id(part_elem->nodegroup_id), has_null_value(FALSE) { - connect_string.str= 0; - connect_string.length= 0; } ~partition_element() {} }; |