mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
5a759d31f7
Benefits of this patch: - Removed a lot of calls to strlen(), especially for field_string - Strings generated by parser are now const strings, less chance of accidently changing a string - Removed a lot of calls with LEX_STRING as parameter (changed to pointer) - More uniform code - Item::name_length was not kept up to date. Now fixed - Several bugs found and fixed (Access to null pointers, access of freed memory, wrong arguments to printf like functions) - Removed a lot of casts from (const char*) to (char*) Changes: - This caused some ABI changes - lex_string_set now uses LEX_CSTRING - Some fucntions are now taking const char* instead of char* - Create_field::change and after changed to LEX_CSTRING - handler::connect_string, comment and engine_name() changed to LEX_CSTRING - Checked printf() related calls to find bugs. Found and fixed several errors in old code. - A lot of changes from LEX_STRING to LEX_CSTRING, especially related to parsing and events. - Some changes from LEX_STRING and LEX_STRING & to LEX_CSTRING* - Some changes for char* to const char* - Added printf argument checking for my_snprintf() - Introduced null_clex_str, star_clex_string, temp_lex_str to simplify code - Added item_empty_name and item_used_name to be able to distingush between items that was given an empty name and items that was not given a name This is used in sql_yacc.yy to know when to give an item a name. - select table_name."*' is not anymore same as table_name.* - removed not used function Item::rename() - Added comparision of item->name_length before some calls to my_strcasecmp() to speed up comparison - Moved Item_sp_variable::make_field() from item.h to item.cc - Some minimal code changes to avoid copying to const char * - Fixed wrong error message in wsrep_mysql_parse() - Fixed wrong code in find_field_in_natural_join() where real_item() was set when it shouldn't - ER_ERROR_ON_RENAME was used with extra arguments. - Removed some (wrong) ER_OUTOFMEMORY, as alloc_root will already give the error. TODO: - Check possible unsafe casts in plugin/auth_examples/qa_auth_interface.c - Change code to not modify LEX_CSTRING for database name (as part of lower_case_table_names)
108 lines
4.2 KiB
C++
108 lines
4.2 KiB
C++
/* Copyright (C) 2010 Monty Program Ab
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
|
|
|
|
/**
|
|
@file
|
|
|
|
Engine defined options of tables/fields/keys in CREATE/ALTER TABLE.
|
|
*/
|
|
|
|
#ifndef SQL_CREATE_OPTIONS_INCLUDED
|
|
#define SQL_CREATE_OPTIONS_INCLUDED
|
|
|
|
#include "sql_class.h"
|
|
|
|
enum { ENGINE_OPTION_MAX_LENGTH=32767 };
|
|
|
|
class engine_option_value: public Sql_alloc
|
|
{
|
|
public:
|
|
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'
|
|
|
|
engine_option_value(engine_option_value *src,
|
|
engine_option_value **start, engine_option_value **end) :
|
|
name(src->name), value(src->value),
|
|
next(NULL), parsed(src->parsed), quoted_value(src->quoted_value)
|
|
{
|
|
link(start, end);
|
|
}
|
|
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_CSTRING &name_arg,
|
|
engine_option_value **start, engine_option_value **end) :
|
|
name(name_arg), value(null_clex_str),
|
|
next(NULL), parsed(false), quoted_value(false)
|
|
{
|
|
link(start, end);
|
|
}
|
|
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)
|
|
{
|
|
char *str;
|
|
if ((value.str= str= (char *)alloc_root(root, 22)))
|
|
{
|
|
value.length= longlong10_to_str(value_arg, str, 10) - str;
|
|
link(start, end);
|
|
}
|
|
}
|
|
static uchar *frm_read(const uchar *buff, const uchar *buff_end,
|
|
engine_option_value **start,
|
|
engine_option_value **end, MEM_ROOT *root);
|
|
void link(engine_option_value **start, engine_option_value **end);
|
|
uint frm_length();
|
|
uchar *frm_image(uchar *buff);
|
|
};
|
|
|
|
typedef struct st_key KEY;
|
|
class Create_field;
|
|
|
|
bool resolve_sysvar_table_options(handlerton *hton);
|
|
void free_sysvar_table_options(handlerton *hton);
|
|
bool parse_engine_table_options(THD *thd, handlerton *ht, TABLE_SHARE *share);
|
|
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,
|
|
TABLE_SHARE *share);
|
|
engine_option_value *merge_engine_table_options(engine_option_value *source,
|
|
engine_option_value *changes,
|
|
MEM_ROOT *root);
|
|
|
|
uint engine_table_options_frm_length(engine_option_value *table_option_list,
|
|
List<Create_field> &create_fields,
|
|
uint keys, KEY *key_info);
|
|
uchar *engine_table_options_frm_image(uchar *buff,
|
|
engine_option_value *table_option_list,
|
|
List<Create_field> &create_fields,
|
|
uint keys, KEY *key_info);
|
|
|
|
bool engine_options_differ(void *old_struct, void *new_struct,
|
|
ha_create_table_option *rules);
|
|
bool is_engine_option_known(engine_option_value *opt,
|
|
ha_create_table_option *rules);
|
|
#endif
|