Commit 9ce78f52 authored by marko's avatar marko

branches/zip: Refuse fast index creation if newraw or innodb_force_recovery

have been set.

ha_innobase::add_index(), ha_innobase::prepare_drop_index(),
ha_innobase::final_drop_index(): Return HA_ERR_WRONG_COMMAND if
newraw or innodb_force_recovery have been set.
parent c09dd214
...@@ -8327,6 +8327,10 @@ ha_innobase::add_index( ...@@ -8327,6 +8327,10 @@ ha_innobase::add_index(
ut_a(key_info); ut_a(key_info);
ut_a(num_of_keys); ut_a(num_of_keys);
if (srv_created_new_raw || srv_force_recovery) {
DBUG_RETURN(HA_ERR_WRONG_COMMAND);
}
update_thd(ha_thd()); update_thd(ha_thd());
heap = mem_heap_create(1024); heap = mem_heap_create(1024);
...@@ -8601,6 +8605,9 @@ ha_innobase::prepare_drop_index( ...@@ -8601,6 +8605,9 @@ ha_innobase::prepare_drop_index(
ut_ad(table); ut_ad(table);
ut_ad(key_num); ut_ad(key_num);
ut_ad(num_of_keys); ut_ad(num_of_keys);
if (srv_created_new_raw || srv_force_recovery) {
DBUG_RETURN(HA_ERR_WRONG_COMMAND);
}
thd = ha_thd(); thd = ha_thd();
...@@ -8746,6 +8753,10 @@ ha_innobase::final_drop_index( ...@@ -8746,6 +8753,10 @@ ha_innobase::final_drop_index(
DBUG_ENTER("ha_innobase::final_drop_index"); DBUG_ENTER("ha_innobase::final_drop_index");
ut_ad(table); ut_ad(table);
if (srv_created_new_raw || srv_force_recovery) {
DBUG_RETURN(HA_ERR_WRONG_COMMAND);
}
thd = ha_thd(); thd = ha_thd();
trx = check_trx_exists(thd); trx = check_trx_exists(thd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment