diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2014-10-15 17:21:59 +0400 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2014-10-15 17:21:59 +0400 |
| commit | be1c17669cb90e18315d7675c8b4d3c906cd64a7 (patch) | |
| tree | e4a0cddd284e813510666ec843344886a160a619 /sql/sql_partition.cc | |
| parent | 041e03e251e783d51ca86e53112e3b87bd2da146 (diff) | |
| parent | fec5ab5a56cb9a45c621207620cc85079cddf537 (diff) | |
| download | mariadb-git-be1c17669cb90e18315d7675c8b4d3c906cd64a7.tar.gz | |
Merge ../10.1 into bb-10.1-explain-json
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 1ce952b9030..9bc8147c75f 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6887,7 +6887,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, 1) Write the new frm, pack it and then delete it 2) Perform the change within the handler */ - if (mysql_write_frm(lpt, WFRM_WRITE_SHADOW | WFRM_PACK_FRM) || + if (mysql_write_frm(lpt, WFRM_WRITE_SHADOW) || mysql_change_partitions(lpt)) { goto err; |