bk commit into 5.0 tree (joerg:1.2226)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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@stripped, 2006-07-11 12:27:35+02:00, joerg@trift2. +3 -0
  Merge trift2.:/M50/clone-5.0
  into  trift2.:/M50/merge-vers-5.0
  MERGE: 1.2191.23.17

  sql/handler.h@stripped, 2006-07-11 12:27:30+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.171.1.2

  sql/sql_table.cc@stripped, 2006-07-11 12:27:30+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.316.1.1

  support-files/mysql.spec.sh@stripped, 2006-07-11 12:27:30+02:00, joerg@trift2. +0 -6
    Auto merged
    MERGE: 1.146.1.1

# 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:	joerg
# Host:	trift2.
# Root:	/M50/merge-vers-5.0/RESYNC

--- 1.174/sql/handler.h	2006-07-11 12:27:42 +02:00
+++ 1.175/sql/handler.h	2006-07-11 12:27:42 +02:00
@@ -410,7 +410,6 @@
 #define HTON_ALTER_NOT_SUPPORTED     (1 << 1) //Engine does not support alter
 #define HTON_CAN_RECREATE            (1 << 2) //Delete all is used fro truncate
 #define HTON_HIDDEN                  (1 << 3) //Engine does not appear in lists
-#define HTON_ALTER_CANNOT_CREATE     (1 << 4) //Cannot use alter to create
 
 typedef struct st_thd_trans
 {

--- 1.317/sql/sql_table.cc	2006-07-11 12:27:42 +02:00
+++ 1.318/sql/sql_table.cc	2006-07-11 12:27:42 +02:00
@@ -3240,9 +3240,7 @@
 
   DBUG_PRINT("info", ("old type: %d  new type: %d", old_db_type, 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) ||
-      (old_db_type != new_db_type &&
-       ha_check_storage_engine_flag(new_db_type, HTON_ALTER_CANNOT_CREATE)))
+      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED))
   {
     DBUG_PRINT("info", ("doesn't support alter"));
     my_error(ER_ILLEGAL_HA, MYF(0), table_name);