From: Georgi Kodinov
Date: July 7 2010 9:16am
Subject: bzr commit into mysql-5.1-bugteam branch (Georgi.Kodinov:3468) Bug#53095
List-Archive: http://lists.mysql.com/commits/113005
X-Bug: 53095
Message-Id: <201007070916.o679G2we025950@magare.gmz>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7145177028939791284=="

--===============7145177028939791284==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/kgeorge/mysql/work/fix-5.1-bugteam/ based on revid:davi.arnaut@stripped

 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
=== 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;
       }
     }


--===============7145177028939791284==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/georgi.kodinov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@stripped\
#   mw40lim5prbn2z1g
# target_branch: file:///home/kgeorge/mysql/work/fix-5.1-bugteam/
# testament_sha1: ddeea1e966e924bb139d4707d6325e2747d41fdd
# timestamp: 2010-07-07 12:16:02 +0300
# base_revision_id: davi.arnaut@stripped\
#   ypwsuv68hedaa7uf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUpgQMcAAcD/gBRQAAD49///
c62eQL////RQBOxdu6Gzx3XOV7pdNeEopkaGo0aZTymZA0Kfqag9IaD1MmT1Boep6gyJBiZDEKmE
9T1NNoagNPUMj1DQAD1BoETKZqajZE00xBk00AABoAYjQMkJlM000mUxDTZR5TQAAAAAGgSUIKeE
J+k0TxQYmjQ00GI0AAAEKPyac7IPtxPC0dZ0lqaaH6M2QRyhyaxw2V+tkJpVDbJ3eQYAnkLWaUs3
NhzZDMyl6FnaHCgQ63VKzk0uvQq1s+hQ22/VSzh96hne1yc7qxWKqbPoW5JVgHwURmfpbQDYT0qI
0jA8M+UtdlZaKXWY6ZmMsXR2ZcN29VgxBDBYr1CMZZ2tZTimXH3qQqxfLGUCFmmx7i7DP2YhNVsm
c7CJJ780mUDQY0FCaWE2jJJFuVgL0rTfGBYInsBFAWalKDfx6EwIGAGMFlKqBhith6KCxXJEsyBD
5MkAC8TGmoQVAuFLKWwtzqHchTyPzyMwZ9C50z3hkykYSemVdR0EfFllEJamcEgKkn624MwuZX1s
QzUthCmYjziYRmYUzbxBx5Q8N0bZlniH2l51gwOiWSoyzUFjJtY1C4JVp0V4/7K8WyjNL9ZjWN/C
JuCA8gxDeOYNcBKLHN2g+Cpl8gHNEe9HiO44sMBeFhy8cBfeQJhAWj0sFspWCoRgaXPE9oUxucS+
7ZiVckLY9+YtKPFrwcwxggiGxmKbAstOJ5DZaxEIcIohWJVxCQRA9CN5sIAPjWSruIPSsl1CM2+N
ukM4Eibnxoqrw5s7W+cXL+ZNTvrL58fzzOk3+fgxT9N9nV1IHFrRt6L37zBbIp6INxKFrB+8uUU4
yZZpiBauWTXA1O0gPhVLglI5S3Fo6nAOYQya1+5EPto301NnEwJU9O0aCklZdqw1w3hgEw8VV0ys
xIoUk8ucaURxy0qcrfAOrsQ8awCNIfKOi01jgmrr624ZRrkL6oFlhWo7vWIF51sD/5j7HQnPmC32
kBVtzMtArcaHumh1qgJr9DnAzV5EL4qf32phjNzxjSEwG9S7t2DW0Y4riMU6qyyXh55JN4xynRyY
fZREHtz5NIBqKn3Hojca9dXhXAEtDFsmsZELsmDG1JyGNyUmvYRbTQ3u16x15WKuBKeNEaX2k3I1
QhDQxisoMLFUgFWoyIbD2mUY2xA+jXmx7nAuIwtYGAFNYoERQEKkDG5lSYlgcXC9m5FU2H3yKO1S
qywUZIOtdL8oSURkk8M8DEBTZrrjmeCl7qgW/InN2JgplSmKsIPYibIhieVoShA0HLYxZxjFOA0a
qp+E5hQzzFwvsN6kgic8IUClJHG2AKTEjUcJsVIeH55ZZRNcSjwjEcIKRjNGK8pcCgErJDVkP6uA
ZA7haL4KBFEgpOCOQgVC+ZYcHIVIUMluqgxtTQLyZb5ztOsAM7AgPKuNkoXEd5MQMJAmYRrsMIMk
WQM5fHFXYcmC1EKEMFE/iwMQ+zsBdzy+pe28B9QqhetzDEMJ4IBsaDXacBj2DEMe1pIgOugnFCtc
kISJwidhhcGiDpBBcuWOuaU3LZFEUVyZTYwNAbABXi5Lt25HIgZchoLgHcOYsxkW0pSiThZUV2hx
iNY4VusQdOZHnDhs1KQfdfLbkGGsvAgcKgpqGpoG451GtsG43LzCBjvKrS4UGTGwqgUAGuZcLSwD
21nqBTdQ3Uqicy5HBS/TKxRM1jpBsaF1S/xdyRThQkEpgQMc


--===============7145177028939791284==--