bk commit into 5.1 tree (jani:1.2136)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2136 06/05/12 19:34:24 jani@stripped +2 -0
  Merge jamppa@stripped:/home/bk/mysql-5.1-new
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509

  sql/sql_show.cc
    1.335 06/05/12 19:34:15 jani@stripped +0 -0
    Auto merged

  sql/sql_parse.cc
    1.547 06/05/12 19:34:14 jani@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.1-new-merge_060509/RESYNC

--- 1.546/sql/sql_parse.cc	2006-05-11 16:27:33 +03:00
+++ 1.547/sql/sql_parse.cc	2006-05-12 19:34:14 +03:00
@@ -2855,6 +2855,17 @@
       res= 1;
       goto end_with_restore_list;
     }
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+    {
+      partition_info *part_info= thd->lex->part_info;
+      if (part_info && !(part_info= thd->lex->part_info->get_clone()))
+      {
+        res= -1;
+        goto end_with_restore_list;
+      }
+      thd->work_part_info= part_info;
+    }
+#endif
     if (select_lex->item_list.elements)		// With select
     {
       select_result *result;
@@ -2924,15 +2935,6 @@
                                      lex->like_name); 
       else
       {
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-        partition_info *part_info= thd->lex->part_info;
-        if (part_info && !(part_info= thd->lex->part_info->get_clone()))
-        {
-          res= -1;
-          goto end_with_restore_list;
-        }
-        thd->work_part_info= part_info;
-#endif
         res= mysql_create_table(thd, create_table->db,
 				create_table->table_name, &lex->create_info,
 				lex->create_list,

--- 1.334/sql/sql_show.cc	2006-05-11 04:20:01 +03:00
+++ 1.335/sql/sql_show.cc	2006-05-12 19:34:15 +03:00
@@ -1286,6 +1286,7 @@
     uint part_syntax_len;
     char *part_syntax;
     if (table->part_info &&
+        (!table->part_info->is_auto_partitioned) &&
         ((part_syntax= generate_partition_syntax(table->part_info,
                                                   &part_syntax_len,
                                                   FALSE,FALSE))))