diff options
| author | Monty <monty@mariadb.org> | 2016-12-02 14:02:30 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-12-02 14:05:16 +0200 |
| commit | 97b21a195354e1f00353a2810e18f0c38fc039cb (patch) | |
| tree | 16be690b1edcde788d5370eb9657048e3ecf61e9 /include | |
| parent | 2996f9aa883d28be3e3156f8cbd4d34ce6797e3c (diff) | |
| download | mariadb-git-97b21a195354e1f00353a2810e18f0c38fc039cb.tar.gz | |
MDEV-10759 Fix Aria to support 2-byte collation IDs
- Used same fix as for MyISAM: High level collation byte stored in unused
bit_end position.
- Moved language from header to base_info
- Removed unused bit_end part in HA_KEY_SEG
Diffstat (limited to 'include')
| -rw-r--r-- | include/maria.h | 2 | ||||
| -rw-r--r-- | include/my_compare.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/maria.h b/include/maria.h index bdd53f3d183..1305b6444c0 100644 --- a/include/maria.h +++ b/include/maria.h @@ -149,7 +149,7 @@ typedef struct st_maria_create_info uint null_bytes; uint old_options; enum data_file_type org_data_file_type; - uint8 language; + uint16 language; my_bool with_auto_increment, transactional; } MARIA_CREATE_INFO; diff --git a/include/my_compare.h b/include/my_compare.h index 0db22b593f4..3440d9ef920 100644 --- a/include/my_compare.h +++ b/include/my_compare.h @@ -57,7 +57,7 @@ typedef struct st_HA_KEYSEG /* Key-portion */ uint16 language; uint8 type; /* Type of key (for sort) */ uint8 null_bit; /* bitmask to test for NULL */ - uint8 bit_start,bit_end; /* if bit field */ + uint8 bit_start; uint8 bit_length; /* Length of bit part */ } HA_KEYSEG; |