diff options
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 19f472e0280..54491c2362b 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5797,8 +5797,7 @@ find_field_in_view(THD *thd, TABLE_LIST *table_list, the replacing item. */ if (*ref && !(*ref)->is_autogenerated_name) - item->set_name(thd, (*ref)->name.str, (*ref)->name.length, - system_charset_info); + item->set_name(thd, (*ref)->name); if (register_tree_change) thd->change_item_tree(ref, item); else @@ -5889,8 +5888,7 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name, si the replacing item. */ if (*ref && !(*ref)->is_autogenerated_name) - item->set_name(thd, (*ref)->name.str, (*ref)->name.length, - system_charset_info); + item->set_name(thd, (*ref)->name); if (register_tree_change && arena) thd->restore_active_arena(arena, &backup); @@ -6306,8 +6304,8 @@ find_field_in_tables(THD *thd, Item_ident *item, bool check_privileges, bool register_tree_change) { Field *found=0; - const char *db= item->db_name; - const char *table_name= item->table_name; + const char *db= item->db_name.str; + const char *table_name= item->table_name.str; const char *name= item->field_name.str; size_t length= item->field_name.length; char name_buff[SAFE_NAME_LEN+1]; @@ -6583,8 +6581,8 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter, if (is_ref_by_name) { field_name= &((Item_ident*) find)->field_name; - table_name= ((Item_ident*) find)->table_name; - db_name= ((Item_ident*) find)->db_name; + table_name= ((Item_ident*) find)->table_name.str; + db_name= ((Item_ident*) find)->db_name.str; } for (uint i= 0; i < n_items; i++) @@ -6624,13 +6622,13 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter, item_field->field_name and item_field->table_name can be 0x0 if item is not fix_field()'ed yet. */ - if (item_field->field_name.str && item_field->table_name && + if (item_field->field_name.str && item_field->table_name.str && !lex_string_cmp(system_charset_info, &item_field->field_name, field_name) && - !my_strcasecmp(table_alias_charset, item_field->table_name, + !my_strcasecmp(table_alias_charset, item_field->table_name.str, table_name) && - (!db_name || (item_field->db_name && - !strcmp(item_field->db_name, db_name)))) + (!db_name || (item_field->db_name.str && + !strcmp(item_field->db_name.str, db_name)))) { if (found_unaliased) { @@ -7527,8 +7525,8 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, MY_INT64_NUM_DECIMAL_DIGITS)); } else if (insert_fields(thd, ((Item_field*) item)->context, - ((Item_field*) item)->db_name, - ((Item_field*) item)->table_name, &it, + ((Item_field*) item)->db_name.str, + ((Item_field*) item)->table_name.str, &it, any_privileges, hidden_bit_fields)) { if (arena) |