Commit 28004bd5 authored by Georgi Kodinov's avatar Georgi Kodinov

Addendum to the fix for bug #53095 (failing information_schema.test on windows)

Since the original fix for this bug lowercases the search pattern it's not a 
good idea to copy the search pattern to the output instead of the real table 
name found (since, depending on the case mode these two names may differ in 
case).
Fixed the infrmation_schema.test failure by making sure the actual table 
name of an inoformation schema table is passed instead of the lookup pattern
even when the pattern doesn't contain wildcards.
parent ebc81cad
...@@ -2939,11 +2939,15 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex, ...@@ -2939,11 +2939,15 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex,
{ {
if (with_i_schema) if (with_i_schema)
{ {
LEX_STRING *name;
ST_SCHEMA_TABLE *schema_table= ST_SCHEMA_TABLE *schema_table=
find_schema_table(thd, lookup_field_vals->table_value.str); find_schema_table(thd, lookup_field_vals->table_value.str);
if (schema_table && !schema_table->hidden) if (schema_table && !schema_table->hidden)
{ {
if (table_names->push_back(&lookup_field_vals->table_value)) if (!(name=
thd->make_lex_string(NULL, schema_table->table_name,
strlen(schema_table->table_name), TRUE)) ||
table_names->push_back(name))
return 1; return 1;
} }
} }
......
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