null+****@clear*****
null+****@clear*****
2012年 4月 22日 (日) 13:43:08 JST
Kouhei Sutou 2012-04-22 13:43:08 +0900 (Sun, 22 Apr 2012)
New Revision: ce8171f01e182c5a06ffa6fb337d8ba49bf63854
Log:
Use suitable return value variable name for final_add_index()
res -> error
Modified files:
ha_mroonga.cpp
Modified: ha_mroonga.cpp (+7 -7)
===================================================================
--- ha_mroonga.cpp 2012-04-22 13:41:54 +0900 (24ce63b)
+++ ha_mroonga.cpp 2012-04-22 13:43:08 +0900 (c799696)
@@ -11058,13 +11058,13 @@ int ha_mroonga::add_index(TABLE *table_arg, KEY *key_info,
#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::wrapper_final_add_index(handler_add_index *add, bool commit)
{
- int res = 0;
+ int error = 0;
MRN_DBUG_ENTER_METHOD();
if (hnd_add_index)
{
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
- res = wrap_handler->final_add_index(hnd_add_index, commit);
+ error = wrap_handler->final_add_index(hnd_add_index, commit);
MRN_SET_BASE_SHARE_KEY(share, table->s);
MRN_SET_BASE_TABLE_KEY(this, table);
}
@@ -11072,7 +11072,7 @@ int ha_mroonga::wrapper_final_add_index(handler_add_index *add, bool commit)
{
delete add;
}
- DBUG_RETURN(res);
+ DBUG_RETURN(error);
}
int ha_mroonga::storage_final_add_index(handler_add_index *add, bool commit)
@@ -11088,14 +11088,14 @@ int ha_mroonga::storage_final_add_index(handler_add_index *add, bool commit)
int ha_mroonga::final_add_index(handler_add_index *add, bool commit)
{
MRN_DBUG_ENTER_METHOD();
- int res;
+ int error;
if (share->wrapper_mode)
{
- res = wrapper_final_add_index(add, commit);
+ error = wrapper_final_add_index(add, commit);
} else {
- res = storage_final_add_index(add, commit);
+ error = storage_final_add_index(add, commit);
}
- DBUG_RETURN(res);
+ DBUG_RETURN(error);
}
#endif