null+****@clear*****
null+****@clear*****
2012年 2月 24日 (金) 15:10:39 JST
Kouhei Sutou 2012-02-24 15:10:39 +0900 (Fri, 24 Feb 2012)
New Revision: 900428d3bdb35263c0d7da49c49c7c7f70ec29d5
Log:
Split operations.
Modified files:
ha_mroonga.cc
Modified: ha_mroonga.cc (+6 -5)
===================================================================
--- ha_mroonga.cc 2012-02-24 14:40:32 +0900 (aad591c)
+++ ha_mroonga.cc 2012-02-24 15:10:39 +0900 (15deada)
@@ -10012,11 +10012,12 @@ int ha_mroonga::wrapper_recreate_indexes(THD *thd)
remove_grn_obj_force(index_name);
mrn_set_bitmap_by_key(table->read_set, &key_info[i]);
}
- if (
- (error = wrapper_create_index(table_share->normalized_path.str, table,
- NULL, share, table_name)) ||
- (error = wrapper_open_indexes(table_share->normalized_path.str, false))
- )
+ error = wrapper_create_index(table_share->normalized_path.str, table,
+ NULL, share, table_name);
+ if (error)
+ DBUG_RETURN(error);
+ error = wrapper_open_indexes(table_share->normalized_path.str, false);
+ if (error)
DBUG_RETURN(error);
if (
(mrn_lock_type != F_UNLCK || !(error = wrapper_external_lock(thd, F_WRLCK)))