bzr commit into mysql-trunk branch (Georgi.Kodinov:3103)

[Georgi Kodinov]

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

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

    modified:
      libmysql/libmysql.c
      sql/sql_show.cc
=== 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;
       }
     }


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