diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
| commit | a5679af1b13bb0c7c4eaa75f27551072dc18fb7d (patch) | |
| tree | 7d039fb5e83c331daa75f9b9b67625b0469f6a9b /sql/handler.cc | |
| parent | 20c4dfd4a9e7c5f2f570488a7ead0b7c74e61817 (diff) | |
| parent | 5f2f3c4fa81851b45dcee33601f14e05f6407333 (diff) | |
| download | mariadb-git-a5679af1b13bb0c7c4eaa75f27551072dc18fb7d.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index bd415122388..4e6dfb7bfae 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4227,7 +4227,7 @@ handler::check_if_supported_inplace_alter(TABLE *altered_table, IS_EQUAL_PACK_LENGTH : IS_EQUAL_YES; if (table->file->check_if_incompatible_data(create_info, table_changes) == COMPATIBLE_DATA_YES) - DBUG_RETURN(HA_ALTER_INPLACE_EXCLUSIVE_LOCK); + DBUG_RETURN(HA_ALTER_INPLACE_NO_LOCK); DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); } |