diff options
| author | unknown <monty@mysql.com> | 2004-12-18 06:05:16 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-18 06:05:16 +0200 |
| commit | e8b60b16121a68111e84c6a8671a3ebde9500d5d (patch) | |
| tree | 8e8581b17151730ec13c7ed6ec00128c62a192a8 /include | |
| parent | 491baa972a2a2f373ae4dd3a1de2470169527326 (diff) | |
| parent | 8eaef91fff849885a7369a21a752e87cb1e592c8 (diff) | |
| download | mariadb-git-e8b60b16121a68111e84c6a8671a3ebde9500d5d.tar.gz | |
Merge with global tree
myisam/mi_key.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysys/my_handler.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
include/my_base.h:
Merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index a1b14ecbb65..9c860c7eebd 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -181,9 +181,13 @@ enum ha_base_keytype { HA_KEYTYPE_INT24=12, HA_KEYTYPE_UINT24=13, HA_KEYTYPE_INT8=14, - HA_KEYTYPE_VARTEXT=15, /* Key is sorted as letters */ - HA_KEYTYPE_VARBINARY=16, /* Key is sorted as unsigned chars */ - HA_KEYTYPE_BIT=17 + /* Varchar (0-255 bytes) with length packed with 1 byte */ + HA_KEYTYPE_VARTEXT1=15, /* Key is sorted as letters */ + HA_KEYTYPE_VARBINARY1=16, /* Key is sorted as unsigned chars */ + /* 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 }; #define HA_MAX_KEYTYPE 31 /* Must be log2-1 */ @@ -391,4 +395,6 @@ typedef ulong ha_rows; #define MAX_FILE_SIZE LONGLONG_MAX #endif +#define HA_VARCHAR_PACKLENGTH(field_length) ((field_length) < 256 ? 1 :2) + #endif /* _my_base_h */ |