bk commit into 5.1 tree (pekka:1.2393)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of . When  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.2393 06/05/13 06:20:13 pekka@stripped +1 -0
  Merge mysql.com:/space/pekka/ndb/version/my51
  into  mysql.com:/space/pekka/ndb/version/my51-tmp

  sql/sql_table.cc
    1.333 06/05/13 06:19:53 pekka@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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-tmp/RESYNC

--- 1.332/sql/sql_table.cc	2006-05-06 05:22:02 +02:00
+++ 1.333/sql/sql_table.cc	2006-05-13 06:19:53 +02:00
@@ -3078,6 +3078,7 @@
     }
     file->set_auto_partitions(part_info);
     part_info->default_engine_type= create_info->db_type;
+    part_info->is_auto_partitioned= TRUE;
   }
   if (part_info)
   {
@@ -3138,8 +3139,8 @@
     }
     DBUG_PRINT("info", ("db_type = %d",
                          ha_legacy_type(part_info->default_engine_type)));
-    if (part_info->check_partition_info( &engine_type, file,
-                             create_info->max_rows))
+    if (part_info->check_partition_info(&engine_type, file,
+                                        create_info->max_rows))
       goto err;
     part_info->default_engine_type= engine_type;
 
@@ -3198,6 +3199,12 @@
     }
     else if (create_info->db_type != engine_type)
     {
+      /*
+        We come here when we don't use a partitioned handler.
+        Since we use a partitioned table it must be "native partitioned".
+        We have switched engine from defaults, most likely only specified
+        engines in partition clauses.
+      */
       delete file;
       if (!(file= get_new_handler((TABLE_SHARE*) 0, thd->mem_root, engine_type)))
       {
@@ -5098,7 +5105,9 @@
              ha_resolve_storage_engine_name(old_db_type),
              ha_resolve_storage_engine_name(new_db_type)));
   if (ha_check_storage_engine_flag(old_db_type, HTON_ALTER_NOT_SUPPORTED) ||
-      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED))
+      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED) ||
+      (old_db_type != new_db_type &&
+       ha_check_storage_engine_flag(new_db_type, HTON_ALTER_CANNOT_CREATE)))
   {
     DBUG_PRINT("info", ("doesn't support alter"));
     my_error(ER_ILLEGAL_HA, MYF(0), table_name);