diff options
Diffstat (limited to 'sql/create_options.h')
| -rw-r--r-- | sql/create_options.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sql/create_options.h b/sql/create_options.h index 6a8d1acd8fe..ce64516794b 100644 --- a/sql/create_options.h +++ b/sql/create_options.h @@ -29,8 +29,8 @@ enum { ENGINE_OPTION_MAX_LENGTH=32767 }; class engine_option_value: public Sql_alloc { public: - LEX_STRING name; - LEX_STRING value; + LEX_CSTRING name; + LEX_CSTRING value; engine_option_value *next; ///< parser puts them in a FIFO linked list bool parsed; ///< to detect unrecognized options bool quoted_value; ///< option=VAL vs. option='VAL' @@ -42,28 +42,30 @@ class engine_option_value: public Sql_alloc { link(start, end); } - engine_option_value(LEX_STRING &name_arg, LEX_STRING &value_arg, bool quoted, + engine_option_value(LEX_CSTRING &name_arg, LEX_CSTRING &value_arg, + bool quoted, engine_option_value **start, engine_option_value **end) : name(name_arg), value(value_arg), next(NULL), parsed(false), quoted_value(quoted) { link(start, end); } - engine_option_value(LEX_STRING &name_arg, + engine_option_value(LEX_CSTRING &name_arg, engine_option_value **start, engine_option_value **end) : - name(name_arg), value(null_lex_str), + name(name_arg), value(null_clex_str), next(NULL), parsed(false), quoted_value(false) { link(start, end); } - engine_option_value(LEX_STRING &name_arg, ulonglong value_arg, + engine_option_value(LEX_CSTRING &name_arg, ulonglong value_arg, engine_option_value **start, engine_option_value **end, MEM_ROOT *root) : name(name_arg), next(NULL), parsed(false), quoted_value(false) { - if ((value.str= (char *)alloc_root(root, 22))) + char *str; + if (likely((value.str= str= (char *)alloc_root(root, 22)))) { - value.length= longlong10_to_str(value_arg, value.str, 10) - value.str; + value.length= longlong10_to_str(value_arg, str, 10) - str; link(start, end); } } @@ -85,7 +87,7 @@ bool parse_option_list(THD* thd, handlerton *hton, void *option_struct, engine_option_value **option_list, ha_create_table_option *rules, bool suppress_warning, MEM_ROOT *root); -bool engine_table_options_frm_read(const uchar *buff, uint length, +bool engine_table_options_frm_read(const uchar *buff, size_t length, TABLE_SHARE *share); engine_option_value *merge_engine_table_options(engine_option_value *source, engine_option_value *changes, |