diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-29 17:34:01 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-29 17:34:01 +0400 |
| commit | be04193c09201326109cae19f0fc5321956b6026 (patch) | |
| tree | 7117971685e3a258e30af05331f0cf52e09d5e1e /include | |
| parent | 30dab869ec370cb4850fab853fb8dde6380d4b17 (diff) | |
| parent | d7d93cf548064aef95f18ac45a9d8c03220abfad (diff) | |
| download | mariadb-git-be04193c09201326109cae19f0fc5321956b6026.tar.gz | |
Merge mysql.com:/home/ram/work/b31137/b31137.5.0
into mysql.com:/home/ram/work/b31137/b31137.5.1
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
mysql-test/include/mix1.inc:
will merge tests manually
mysql-test/r/innodb_mysql.result:
will merge tests manually
mysql-test/r/key.result:
will merge tests manually
mysql-test/t/key.test:
will merge tests manually
include/my_base.h:
manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h index 339554979a8..054e21596bd 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -244,6 +244,8 @@ enum ha_base_keytype { HA_BINARY_PACK_KEY | HA_FULLTEXT | HA_UNIQUE_CHECK | \ HA_SPATIAL | HA_NULL_ARE_EQUAL | HA_GENERATED_KEY) +#define HA_KEY_HAS_PART_KEY_SEG 65536 /* Key contains partial segments */ + /* Automatic bits in key-flag */ #define HA_SPACE_PACK_USED 4 /* Test for if SPACE_PACK used */ |