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 /storage/myisam/mi_open.c | |
| 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 'storage/myisam/mi_open.c')
| -rw-r--r-- | storage/myisam/mi_open.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c index b8cbefe6ac2..2d794f611d7 100644 --- a/storage/myisam/mi_open.c +++ b/storage/myisam/mi_open.c @@ -1183,7 +1183,6 @@ uchar *mi_keyseg_read(uchar *ptr, HA_KEYSEG *keyseg) keyseg->length = mi_uint2korr(ptr); ptr +=2; keyseg->start = mi_uint4korr(ptr); ptr +=4; keyseg->null_pos = mi_uint4korr(ptr); ptr +=4; - keyseg->bit_end= 0; keyseg->charset=0; /* Will be filled in later */ if (keyseg->null_bit) /* We adjust bit_pos if null_bit is last in the byte */ |