mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.0' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2016-05-04 15:23:26 +02:00
commit 87e3e67f43
218 changed files with 3609 additions and 1022 deletions
Download patch file Download diff file Expand all files Collapse all files

14
storage/innobase/handler/handler0alter.cc
View file

@ -459,6 +459,20 @@ ha_innobase::check_if_supported_inplace_alter(
}
}
ulint n_indexes = UT_LIST_GET_LEN((prebuilt->table)->indexes);
/* If InnoDB dictionary and MySQL frm file are not consistent
use "Copy" method. */
if (prebuilt->table->dict_frm_mismatch) {
ha_alter_info->unsupported_reason = innobase_get_err_msg(
ER_NO_SUCH_INDEX);
ib_push_frm_error(user_thd, prebuilt->table, altered_table,
n_indexes, true);
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
}
/* We should be able to do the operation in-place.
See if we can do it online (LOCK=NONE). */
bool online = true;