diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-23 20:53:29 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-23 20:53:29 -0500 |
| commit | 0d58323e2645460907280b0482811729822a7ef1 (patch) | |
| tree | 1b0400c627851e0cb9c9445e24367a5ce9fd5d4d /sql/handler.cc | |
| parent | 276d65b324f4f0021bc457b4d5723153d4e12608 (diff) | |
| parent | a4b271496888e1f8628d0af36309e35293093577 (diff) | |
| download | mariadb-git-0d58323e2645460907280b0482811729822a7ef1.tar.gz | |
Merge tag 'mariadb-10.0.24' into 10.0-galera
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 a7beb6fe9ed..f3b908ceb1e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4306,7 +4306,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); } |