diff options
author | Monty <monty@mariadb.org> | 2017-04-23 19:39:57 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2017-04-23 22:35:46 +0300 |
commit | 5a759d31f766087d5e135e1d3d3d987693bc9b88 (patch) | |
tree | 93c7359e8b211e269bfa73e5f595f34b9dca575a /storage/federatedx | |
parent | cba84469eb96481568a9f4ddf3f2989c49c9294c (diff) | |
download | mariadb-git-5a759d31f766087d5e135e1d3d3d987693bc9b88.tar.gz |
Changing field::field_name and Item::name to LEX_CSTRING
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)
Diffstat (limited to 'storage/federatedx')
-rw-r--r-- | storage/federatedx/ha_federatedx.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index a7b1edd0086..17f228c1209 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -892,8 +892,8 @@ uint ha_federatedx::convert_row_to_internal_format(uchar *record, static bool emit_key_part_name(String *to, KEY_PART_INFO *part) { DBUG_ENTER("emit_key_part_name"); - if (append_ident(to, part->field->field_name, - strlen(part->field->field_name), ident_quote_char)) + if (append_ident(to, part->field->field_name.str, + part->field->field_name.length, ident_quote_char)) DBUG_RETURN(1); // Out of memory DBUG_RETURN(0); } @@ -1595,8 +1595,8 @@ static FEDERATEDX_SHARE *get_share(const char *table_name, TABLE *table) query.append(STRING_WITH_LEN("SELECT ")); for (field= table->field; *field; field++) { - append_ident(&query, (*field)->field_name, - strlen((*field)->field_name), ident_quote_char); + append_ident(&query, (*field)->field_name.str, + (*field)->field_name.length, ident_quote_char); query.append(STRING_WITH_LEN(", ")); } /* chops off trailing comma */ @@ -1604,7 +1604,7 @@ static FEDERATEDX_SHARE *get_share(const char *table_name, TABLE *table) query.append(STRING_WITH_LEN(" FROM ")); - append_ident(&query, tmp_share.table_name, + append_ident(&query, tmp_share.table_name, tmp_share.table_name_length, ident_quote_char); if (!(share= (FEDERATEDX_SHARE *) memdup_root(&mem_root, (char*)&tmp_share, sizeof(*share))) || @@ -1900,7 +1900,7 @@ bool ha_federatedx::append_stmt_insert(String *query) insert_string.append(STRING_WITH_LEN("INSERT IGNORE INTO ")); else insert_string.append(STRING_WITH_LEN("INSERT INTO ")); - append_ident(&insert_string, share->table_name, share->table_name_length, + append_ident(&insert_string, share->table_name, share->table_name_length, ident_quote_char); tmp_length= insert_string.length(); insert_string.append(STRING_WITH_LEN(" (")); @@ -1914,8 +1914,8 @@ bool ha_federatedx::append_stmt_insert(String *query) if (bitmap_is_set(table->write_set, (*field)->field_index)) { /* append the field name */ - append_ident(&insert_string, (*field)->field_name, - strlen((*field)->field_name), ident_quote_char); + append_ident(&insert_string, (*field)->field_name.str, + (*field)->field_name.length, ident_quote_char); /* append commas between both fields and fieldnames */ /* @@ -2212,7 +2212,7 @@ int ha_federatedx::optimize(THD* thd, HA_CHECK_OPT* check_opt) query.set_charset(system_charset_info); query.append(STRING_WITH_LEN("OPTIMIZE TABLE ")); - append_ident(&query, share->table_name, share->table_name_length, + append_ident(&query, share->table_name, share->table_name_length, ident_quote_char); DBUG_ASSERT(txn == get_txn(thd)); @@ -2238,7 +2238,7 @@ int ha_federatedx::repair(THD* thd, HA_CHECK_OPT* check_opt) query.set_charset(system_charset_info); query.append(STRING_WITH_LEN("REPAIR TABLE ")); - append_ident(&query, share->table_name, share->table_name_length, + append_ident(&query, share->table_name, share->table_name_length, ident_quote_char); if (check_opt->flags & T_QUICK) query.append(STRING_WITH_LEN(" QUICK")); @@ -2342,8 +2342,8 @@ int ha_federatedx::update_row(const uchar *old_data, const uchar *new_data) { if (bitmap_is_set(table->write_set, (*field)->field_index)) { - uint field_name_length= strlen((*field)->field_name); - append_ident(&update_string, (*field)->field_name, field_name_length, + append_ident(&update_string, (*field)->field_name.str, + (*field)->field_name.length, ident_quote_char); update_string.append(STRING_WITH_LEN(" = ")); @@ -2368,8 +2368,8 @@ int ha_federatedx::update_row(const uchar *old_data, const uchar *new_data) if (bitmap_is_set(table->read_set, (*field)->field_index)) { - uint field_name_length= strlen((*field)->field_name); - append_ident(&where_string, (*field)->field_name, field_name_length, + append_ident(&where_string, (*field)->field_name.str, + (*field)->field_name.length, ident_quote_char); if (field_in_record_is_null(table, *field, (char*) old_data)) where_string.append(STRING_WITH_LEN(" IS NULL ")); @@ -2455,8 +2455,8 @@ int ha_federatedx::delete_row(const uchar *buf) found++; if (bitmap_is_set(table->read_set, cur_field->field_index)) { - append_ident(&delete_string, (*field)->field_name, - strlen((*field)->field_name), ident_quote_char); + append_ident(&delete_string, (*field)->field_name.str, + (*field)->field_name.length, ident_quote_char); data_string.length(0); if (cur_field->is_null()) { |