bzr push into mysql-5.1-bugteam branch (Georgi.Kodinov:3467 to 3468) Bug#53095

[Georgi Kodinov]

 3468 Georgi Kodinov	2010-07-07
      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.

    modified:
      sql/sql_show.cc
 3467 Davi Arnaut	2010-07-06
      Fix what is probably the result of a bad merge. No functional change.

    modified:
      libmysql/libmysql.c
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-06-25 12:59:44 +0000
+++ b/sql/sql_show.cc	2010-07-07 09:15:58 +0000
@@ -2939,11 +2939,15 @@ make_table_name_list(THD *thd, List<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;
       }
     }


Attachment: [text/bzr-bundle] bzr/[e-mail]