diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-05-26 06:17:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-05-26 09:49:13 +0400 |
| commit | 9f23f8e59807f8ebc6a45e176332f33e2ac09d6c (patch) | |
| tree | b459d361418a73d3e274a73d4122bf6e4cf6575b /sql/sql_help.cc | |
| parent | ac93d7d674cd9955c940055d9777e98a1fbaf1cd (diff) | |
| download | mariadb-git-9f23f8e59807f8ebc6a45e176332f33e2ac09d6c.tar.gz | |
MDEV-19599 Change db_name, table_name to LEX_CSTRING in Item_ident and Send_field
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index e5f1e958d99..e3e22bf38fb 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -92,14 +92,12 @@ static bool init_fields(THD *thd, TABLE_LIST *tables, context->resolve_in_table_list_only(tables); for (; count-- ; find_fields++) { - LEX_CSTRING field_name= {find_fields->field_name, - strlen(find_fields->field_name) }; /* We have to use 'new' here as field will be re_linked on free */ Item_field *field= (new (thd->mem_root) Item_field(thd, context, - "mysql", - find_fields->table_name, - &field_name)); + {STRING_WITH_LEN("mysql")}, + Lex_cstring_strlen(find_fields->table_name), + Lex_cstring_strlen(find_fields->field_name))); if (!(find_fields->field= find_field_in_tables(thd, field, tables, NULL, 0, REPORT_ALL_ERRORS, 1, TRUE))) |