summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-19 20:25:19 +0200
committermonty@mysql.com <>2004-12-19 20:25:19 +0200
commit6477b4dfd21d916de39d5cc107c8207fe24fe4b6 (patch)
treeedce84855fbf08b0328dae28794074f565be89e6 /include
parent2a215c17bb42c4f088418685f8128a9eb7370853 (diff)
downloadmariadb-git-6477b4dfd21d916de39d5cc107c8207fe24fe4b6.tar.gz
Merge with global tree
Fixed some found bugs in BIT fields Added more test cases for BIT fields and varchar
Diffstat (limited to 'include')
-rw-r--r--include/my_base.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h
index 9c860c7eebd..4d043cf6b5b 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -187,7 +187,7 @@ enum ha_base_keytype {
/* Varchar (0-65535 bytes) with length packed with 2 bytes */
HA_KEYTYPE_VARTEXT2=17, /* Key is sorted as letters */
HA_KEYTYPE_VARBINARY2=18, /* Key is sorted as unsigned chars */
- HA_KEYTYPE_BIT=18
+ HA_KEYTYPE_BIT=19
};
#define HA_MAX_KEYTYPE 31 /* Must be log2-1 */
@@ -237,6 +237,7 @@ enum ha_base_keytype {
Only needed for internal temporary tables.
*/
#define HA_END_SPACE_ARE_EQUAL 512
+#define HA_BIT_PART 1024
/* optionbits for database */
#define HA_OPTION_PACK_RECORD 1