summaryrefslogtreecommitdiff
path: root/include/my_base.h
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-11-21 12:27:58 +0100
committerunknown <msvensson@neptunus.(none)>2005-11-21 12:27:58 +0100
commit95b92b4369cd85c3c04d1910e30333e862f416fa (patch)
tree6758d03590023e530184cc45b5e37de118b29418 /include/my_base.h
parent83bbd30c480d97f57203b999cff4517f5e04bf13 (diff)
downloadmariadb-git-95b92b4369cd85c3c04d1910e30333e862f416fa.tar.gz
Bug #14514 Creating table with packed key fails silently
- Backport from 5.0 include/my_base.h: Rename HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE, ie. it's a bit in the table_options variable mysql-test/r/ndb_basic.result: Add test result mysql-test/t/ndb_basic.test: Add test case for bug14514 sql/ha_ndbcluster.cc: Use new bitmask for table_options to detect if create from engine sql/handler.cc: Use new bit for create from engine
Diffstat (limited to 'include/my_base.h')
-rw-r--r--include/my_base.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h
index d702ec45140..271e7cd23ba 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -231,6 +231,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 */
@@ -241,7 +242,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 */