bk commit into 5.0 tree (msvensson:1.1964) BUG#14514

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1964 05/11/02 15:53:04 msvensson@neptunus.(none) +3 -0
  BUG#14514 Creating table with packed key fails silently

  sql/handler.cc
    1.201 05/11/02 15:52:49 msvensson@neptunus.(none) +1 -1
    Use HA_OPTION_CREATE_FROM_ENGINE

  sql/ha_ndbcluster.cc
    1.218 05/11/02 15:52:49 msvensson@neptunus.(none) +1 -1
    Use HA_OPTION_CREATE_FROM_ENGINE

  include/my_base.h
    1.72 05/11/02 15:52:49 msvensson@neptunus.(none) +1 -1
    Move HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.71/include/my_base.h	2005-10-27 19:04:31 +02:00
+++ 1.72/include/my_base.h	2005-11-02 15:52:49 +01:00
@@ -248,6 +248,7 @@
 #define HA_OPTION_CHECKSUM		32
 #define HA_OPTION_DELAY_KEY_WRITE	64
 #define HA_OPTION_NO_PACK_KEYS		128  /* Reserved for MySQL */
+#define HA_OPTION_CREATE_FROM_ENGINE    256 
 #define HA_OPTION_TEMP_COMPRESS_RECORD	((uint) 16384)	/* set by isamchk */
 #define HA_OPTION_READ_ONLY_DATA	((uint) 32768)	/* Set by isamchk */
 
@@ -258,7 +259,6 @@
 #define HA_CREATE_TMP_TABLE	4
 #define HA_CREATE_CHECKSUM	8
 #define HA_CREATE_DELAY_KEY_WRITE 64
-#define HA_CREATE_FROM_ENGINE   128 
 
 	/* Bits in flag to _status */
 

--- 1.200/sql/handler.cc	2005-10-13 18:40:43 +02:00
+++ 1.201/sql/handler.cc	2005-11-02 15:52:49 +01:00
@@ -2016,7 +2016,7 @@
     DBUG_RETURN(3);
 
   update_create_info_from_table(&create_info, &table);
-  create_info.table_options|= HA_CREATE_FROM_ENGINE;
+  create_info.table_options|= HA_OPTION_CREATE_FROM_ENGINE;
 
   if (lower_case_table_names == 2 &&
       !(table.file->table_flags() & HA_FILE_BASED))

--- 1.217/sql/ha_ndbcluster.cc	2005-10-25 08:20:26 +02:00
+++ 1.218/sql/ha_ndbcluster.cc	2005-11-02 15:52:49 +01:00
@@ -3861,7 +3861,7 @@
   uint pack_length, length, i, pk_length= 0;
   const void *data, *pack_data;
   char name2[FN_HEADLEN];
-  bool create_from_engine= (info->table_options & HA_CREATE_FROM_ENGINE);
+  bool create_from_engine= (info->table_options & HA_OPTION_CREATE_FROM_ENGINE);
    
   DBUG_ENTER("ha_ndbcluster::create");
   DBUG_PRINT("enter", ("name: %s", name));