database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-19599 Change db_name, table_name to LEX_CSTRING in Item_ident and Send_field

Browse Source
This commit is contained in:
Alexander Barkov
2019-05-26 06:17:35 +04:00
parent ac93d7d674
commit 9f23f8e598
31 changed files with 319 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/field.cc
View File

@@ -1965,24 +1965,24 @@ void Field::make_send_field(Send_field *field)
{
if (orig_table && orig_table->s->db.str && *orig_table->s->db.str)
{
field->db_name= orig_table->s->db.str;
field->db_name= orig_table->s->db;
if (orig_table->pos_in_table_list &&
orig_table->pos_in_table_list->schema_table)
field->org_table_name= (orig_table->pos_in_table_list->
schema_table->table_name);
field->org_table_name= Lex_cstring_strlen(orig_table->pos_in_table_list->
schema_table->table_name);
else
field->org_table_name= orig_table->s->table_name.str;
field->org_table_name= orig_table->s->table_name;
}
else
field->org_table_name= field->db_name= "";
field->org_table_name= field->db_name= empty_clex_str;
if (orig_table && orig_table->alias.ptr())
{
field->table_name= orig_table->alias.ptr();
field->table_name= orig_table->alias.lex_cstring();
field->org_col_name= field_name;
}
else
{
field->table_name= "";
field->table_name= empty_clex_str;
field->org_col_name= empty_clex_str;
}
field->col_name= field_name;