diff options
| author | monty@mysql.com <> | 2005-11-05 13:20:35 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-11-05 13:20:35 +0200 |
| commit | cdf64f0f5724077d58158ecc8894cfff85dbc9c0 (patch) | |
| tree | 460c9bc04fe66682e1873d2b1e848a224ae7eb8d /include/my_base.h | |
| parent | a6f5375cb0cb40055f52e92d20ca04233ce70386 (diff) | |
| download | mariadb-git-cdf64f0f5724077d58158ecc8894cfff85dbc9c0.tar.gz | |
Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/my_base.h b/include/my_base.h index 4a6a384c438..c11e52fb996 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -209,12 +209,8 @@ enum ha_base_keytype { #define HA_SPACE_PACK_USED 4 /* Test for if SPACE_PACK used */ #define HA_VAR_LENGTH_KEY 8 #define HA_NULL_PART_KEY 64 -#ifndef ISAM_LIBRARY +#define HA_USES_PARSER 16384 /* Fulltext index uses [pre]parser */ #define HA_SORT_ALLOWS_SAME 512 /* Intern bit when sorting records */ -#else -/* poor old NISAM has 8-bit flags :-( */ -#define HA_SORT_ALLOWS_SAME 128 /* Intern bit when sorting records */ -#endif /* Key has a part that can have end space. If this is an unique key we have to handle it differently from other unique keys as we can find |