From: Georgi Kodinov
Date: July 7 2010 10:06am
Subject: bzr push into mysql-trunk branch (Georgi.Kodinov:3102 to 3103)
List-Archive: http://lists.mysql.com/commits/113009
Message-Id: <201007071006.o67A6CPQ009749@magare.gmz>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4086920977862194602=="

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

 3103 Georgi Kodinov	2010-07-07 [merge]
      merge

    modified:
      libmysql/libmysql.c
      sql/sql_show.cc
 3102 Davi Arnaut	2010-07-06 [merge]
      Merge of mysql-5.1-bugteam into mysql-trunk-merge.

    modified:
      configure.in
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2010-07-02 19:38:04 +0000
+++ b/libmysql/libmysql.c	2010-07-07 10:05:08 +0000
@@ -4042,6 +4042,7 @@ static my_bool setup_one_fetch_function(
   case MYSQL_TYPE_TIME:
     field->max_length= 15;                    /* 19:23:48.123456 */
     param->skip_result= skip_result_with_length;
+    break;
   case MYSQL_TYPE_DATE:
     field->max_length= 10;                    /* 2003-11-11 */
     param->skip_result= skip_result_with_length;

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-07-05 10:05:04 +0000
+++ b/sql/sql_show.cc	2010-07-07 10:05:08 +0000
@@ -2875,11 +2875,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;
       }
     }


--===============4086920977862194602==
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\
#   gpkybe10az56pvp6
# target_branch: file:///home/kgeorge/mysql/work/fix-trunk-merge/
# testament_sha1: 01fd6cf42db94b664c579f805ad32b4ff731b560
# timestamp: 2010-07-07 13:06:12 +0300
# source_branch: file:///home/kgeorge/mysql/work/fix-5.1-bugteam/
# base_revision_id: davi.arnaut@stripped\
#   hhv5nkt46uitgv78
# 
# Begin bundle
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


--===============4086920977862194602==--