Commit 57c37e6c authored by Varun Gupta's avatar Varun Gupta

Adjusting sql_command to align with higher version, this is an adjustment

to the patch for MDEV-17605
parent e9da78ee
...@@ -4272,8 +4272,8 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys, ...@@ -4272,8 +4272,8 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
SQLCOM_SHOW_FIELDS is used because it satisfies SQLCOM_SHOW_FIELDS is used because it satisfies
'only_view_structure()'. 'only_view_structure()'.
*/ */
lex->sql_command= SQLCOM_SHOW_FIELDS;
thd->force_read_stats= get_schema_table_idx(schema_table) == SCH_STATISTICS; thd->force_read_stats= get_schema_table_idx(schema_table) == SCH_STATISTICS;
lex->sql_command= SQLCOM_SHOW_FIELDS;
result= (open_temporary_tables(thd, table_list) || result= (open_temporary_tables(thd, table_list) ||
open_normal_and_derived_tables(thd, table_list, open_normal_and_derived_tables(thd, table_list,
(MYSQL_OPEN_IGNORE_FLUSH | (MYSQL_OPEN_IGNORE_FLUSH |
...@@ -4281,16 +4281,15 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys, ...@@ -4281,16 +4281,15 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
(can_deadlock ? (can_deadlock ?
MYSQL_OPEN_FAIL_ON_MDL_CONFLICT : 0)), MYSQL_OPEN_FAIL_ON_MDL_CONFLICT : 0)),
DT_PREPARE | DT_CREATE)); DT_PREPARE | DT_CREATE));
(void) read_statistics_for_tables_if_needed(thd, table_list);
thd->force_read_stats= false;
/* /*
Restore old value of sql_command back as it is being looked at in Restore old value of sql_command back as it is being looked at in
process_table() function. process_table() function.
*/ */
lex->sql_command= old_lex->sql_command; lex->sql_command= old_lex->sql_command;
(void) read_statistics_for_tables_if_needed(thd, table_list);
thd->force_read_stats= false;
DEBUG_SYNC(thd, "after_open_table_ignore_flush"); DEBUG_SYNC(thd, "after_open_table_ignore_flush");
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment