diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-11-02 15:53:04 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-11-02 15:53:04 +0100 |
| commit | 316e95049d4957923e2a72394b16e988a1d68ad4 (patch) | |
| tree | 2ee0e1b6bb0bdf078f424e661d1cd174ca4c7863 | |
| parent | ec69ca57c8f5dfd12c1eff039d43c4db494178e2 (diff) | |
| download | mariadb-git-316e95049d4957923e2a72394b16e988a1d68ad4.tar.gz | |
BUG#14514 Creating table with packed key fails silently
include/my_base.h:
Move HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE
sql/ha_ndbcluster.cc:
Use HA_OPTION_CREATE_FROM_ENGINE
sql/handler.cc:
Use HA_OPTION_CREATE_FROM_ENGINE
| -rw-r--r-- | include/my_base.h | 2 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index c76cf8c604e..ba3edfad0c8 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -248,6 +248,7 @@ enum ha_base_keytype { #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 @@ enum ha_base_keytype { #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 */ diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 4248230abbe..71bd3acd2a6 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3861,7 +3861,7 @@ int ha_ndbcluster::create(const char *name, 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)); diff --git a/sql/handler.cc b/sql/handler.cc index 81e94af5dc7..0cc3deda523 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2016,7 +2016,7 @@ int ha_create_table_from_engine(THD* thd, 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)) |