summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-07-07 12:15:58 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-07-07 12:15:58 +0300
commitd9e7c4efb6bfebf625af629b3ca878f1d0dc7e02 (patch)
treed5381f8462a10c79e1a4a47a1c9839b8db0d5745
parent6652fc78b7b5e1093a0670c3271fec7d626bb222 (diff)
downloadmariadb-git-d9e7c4efb6bfebf625af629b3ca878f1d0dc7e02.tar.gz
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.
-rw-r--r--sql/sql_show.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 0eeb333f278..17fbf62b097 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2939,11 +2939,15 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex,
{
if (with_i_schema)
{
+ LEX_STRING *name;
ST_SCHEMA_TABLE *schema_table=
find_schema_table(thd, lookup_field_vals->table_value.str);
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;
}
}