diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2013-02-14 17:03:49 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2013-02-14 17:03:49 +0100 |
| commit | 89681f6dc65a9fe186e29493f73a97ecb34f6414 (patch) | |
| tree | a15708b55ecdb842e6b0718e81f7ef56b4dbd8f0 /sql/ha_partition.cc | |
| parent | c0333739cc2cfc17f22efa13015bcfba2abae509 (diff) | |
| download | mariadb-git-89681f6dc65a9fe186e29493f73a97ecb34f6414.tar.gz | |
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN
DOWNGRADED FROM 5.6.11 TO 5.6.10
Problem was new syntax not accepted by previous version.
Fixed by adding version comment of /*!50531 around the
new syntax.
Like this in the .frm file:
'PARTITION BY KEY /*!50611 ALGORITHM = 2 */ () PARTITIONS 3'
and also changing the output from SHOW CREATE TABLE to:
CREATE TABLE t1 (a INT)
/*!50100 PARTITION BY KEY */ /*!50611 ALGORITHM = 1 */ /*!50100 ()
PARTITIONS 3 */
It will always add the ALGORITHM into the .frm for KEY [sub]partitioned
tables, but for SHOW CREATE TABLE it will only add it in case it is the non
default ALGORITHM = 1.
Also notice that for 5.5, it will say /*!50531 instead of /*!50611, which
will make upgrade from 5.5 > 5.5.31 to 5.6 < 5.6.11 fail!
If one downgrades an fixed version to the same major version (5.5 or 5.6) the
bug 14521864 will be visible again, but unless the .frm is updated, it will
work again when upgrading again.
Also fixed so that the .frm does not get updated version
if a single partition check passes.
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 4afae052b76..859b3891b25 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -7968,6 +7968,7 @@ int ha_partition::check_for_upgrade(HA_CHECK_OPT *check_opt) true, true, NULL, + NULL, NULL)) || /* Also check that the length is smaller than the output field! */ (part_buf_len + db_name.length() + table_name.length()) >= @@ -7991,8 +7992,8 @@ int ha_partition::check_for_upgrade(HA_CHECK_OPT *check_opt) part_buf); } m_part_info->key_algorithm= old_algorithm; + DBUG_RETURN(error); } - break; default: /* Not affected! */ ; |