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

Merge branch 'merge-innodb-5.6' into 10.0

Browse source
This commit is contained in:
Sergei Golubchik 2015-10-09 17:47:30 +02:00
commit 04af573d65
18 changed files with 394 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -240,7 +240,7 @@ ha_innobase::check_if_supported_inplace_alter(
{
DBUG_ENTER("check_if_supported_inplace_alter");
if (srv_read_only_mode) {
if (high_level_read_only) {
ha_alter_info->unsupported_reason =
innobase_get_err_msg(ER_READ_ONLY_MODE);
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);