Kouhei Sutou
null+****@clear*****
Wed Oct 22 23:58:50 JST 2014
Kouhei Sutou 2014-10-22 23:58:50 +0900 (Wed, 22 Oct 2014) New Revision: a697205de1e23b2ad0809f0d1f561ce74dcb5cde https://github.com/mroonga/mroonga/commit/a697205de1e23b2ad0809f0d1f561ce74dcb5cde Message: Use more meaningful name and description Modified files: ha_mroonga.cpp mrn_err.h Modified: ha_mroonga.cpp (+4 -4) =================================================================== --- ha_mroonga.cpp 2014-10-22 23:53:48 +0900 (aafed9f) +++ ha_mroonga.cpp 2014-10-22 23:58:50 +0900 (9dcfd32) @@ -1230,8 +1230,8 @@ grn_obj_flags mrn_parse_grn_column_create_flags(THD *thd, flags |= GRN_OBJ_COMPRESS_ZLIB; } else { push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_MRN_INVALID_COLUMN_FLAG_NUM, - ER_MRN_INVALID_COLUMN_FLAG_STR, + ER_MRN_UNSUPPORTED_COLUMN_FLAG_NUM, + ER_MRN_UNSUPPORTED_COLUMN_FLAG_STR, "COMPRESS_ZLIB"); } flag_names += 13; @@ -1240,8 +1240,8 @@ grn_obj_flags mrn_parse_grn_column_create_flags(THD *thd, flags |= GRN_OBJ_COMPRESS_LZ4; } else { push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_MRN_INVALID_COLUMN_FLAG_NUM, - ER_MRN_INVALID_COLUMN_FLAG_STR, + ER_MRN_UNSUPPORTED_COLUMN_FLAG_NUM, + ER_MRN_UNSUPPORTED_COLUMN_FLAG_STR, "COMPRESS_LZ4"); } flag_names += 12; Modified: mrn_err.h (+2 -2) =================================================================== --- mrn_err.h 2014-10-22 23:53:48 +0900 (286cff2) +++ mrn_err.h 2014-10-22 23:58:50 +0900 (965abe3) @@ -28,7 +28,7 @@ #define ER_MRN_ERROR_FROM_GROONGA_STR "Error from Groonga [%s]" #define ER_MRN_INVALID_NULL_VALUE_NUM 16505 #define ER_MRN_INVALID_NULL_VALUE_STR "NULL value can't be used for %s" -#define ER_MRN_INVALID_COLUMN_FLAG_NUM 16506 -#define ER_MRN_INVALID_COLUMN_FLAG_STR "The column flag '%-.64s' is invalid. It is ignored." +#define ER_MRN_UNSUPPORTED_COLUMN_FLAG_NUM 16506 +#define ER_MRN_UNSUPPORTED_COLUMN_FLAG_STR "The column flag '%-.64s' is unsupported. It is ignored." #endif /* MRN_ERR_H_ */ -------------- next part -------------- HTML����������������������������...다운로드
