summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2007-12-17 19:22:04 +0100
committerunknown <serg@janus.mylan>2007-12-17 19:22:04 +0100
commitb621aecc155d6d5e72f9f70be1b22d294f00ef7a (patch)
treec8ed8e32e9a58037ac237eccc01ecc214de3a9d3
parent2b7a69457cc48bf25724e8a89ec48d343c15b26c (diff)
downloadmariadb-git-b621aecc155d6d5e72f9f70be1b22d294f00ef7a.tar.gz
move HA_OPTIONS_xxx where they belong
-rw-r--r--include/my_base.h6
-rw-r--r--sql/handler.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/my_base.h b/include/my_base.h
index 2b60ff552a4..6c7bea6573c 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -296,8 +296,10 @@ enum ha_base_keytype {
#define HA_OPTION_RELIES_ON_SQL_LAYER 512
#define HA_OPTION_NULL_FIELDS 1024
#define HA_OPTION_PAGE_CHECKSUM 2048
-#define HA_OPTION_TEMP_COMPRESS_RECORD ((uint) 16384) /* set by isamchk */
-#define HA_OPTION_READ_ONLY_DATA ((uint) 32768) /* Set by isamchk */
+#define HA_OPTION_TEMP_COMPRESS_RECORD (1L << 15) /* set by isamchk */
+#define HA_OPTION_READ_ONLY_DATA (1L << 16) /* Set by isamchk */
+#define HA_OPTION_NO_CHECKSUM (1L << 17)
+#define HA_OPTION_NO_DELAY_KEY_WRITE (1L << 18)
/* Bits in flag to create() */
diff --git a/sql/handler.h b/sql/handler.h
index d9533739af2..024c724b70f 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -237,8 +237,6 @@
#define HA_LEX_CREATE_TMP_TABLE 1
#define HA_LEX_CREATE_IF_NOT_EXISTS 2
#define HA_LEX_CREATE_TABLE_LIKE 4
-#define HA_OPTION_NO_CHECKSUM (1L << 17)
-#define HA_OPTION_NO_DELAY_KEY_WRITE (1L << 18)
#define HA_MAX_REC_LENGTH 65535
/* Table caching type */