mirror of
https://github.com/MariaDB/server.git
synced 2026-04-21 07:45:32 +02:00
Merge bk-internal:/home/bk/mysql-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B22367-5.0-opt-merge include/my_base.h: Auto merged mysql-test/r/select.result: merge of 5.0-opt to 22367 mysql-test/t/select.test: merge of 5.0-opt to 22367
This commit is contained in:
commit
a2e0c419d3
6 changed files with 38 additions and 9 deletions
|
|
@ -224,12 +224,17 @@ enum ha_base_keytype {
|
|||
/* poor old NISAM has 8-bit flags :-( */
|
||||
#define HA_SORT_ALLOWS_SAME 128 /* Intern bit when sorting records */
|
||||
#endif
|
||||
#if MYSQL_VERSION_ID < 0x50200
|
||||
/*
|
||||
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
|
||||
many matching rows for one key (because end space are not compared)
|
||||
*/
|
||||
#define HA_END_SPACE_KEY 4096
|
||||
#define HA_END_SPACE_KEY 0 /* was: 4096 */
|
||||
#else
|
||||
#error HA_END_SPACE_KEY is obsolete, please remove it
|
||||
#endif
|
||||
|
||||
|
||||
/* These flags can be added to key-seg-flag */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue