diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
| commit | 1387e71531495b1224bfafd6867ae5fae9cf469c (patch) | |
| tree | 6307410443d2eeee3817acf552e3ce583e9444d8 /sql/key.h | |
| parent | 44db9c41b389a2eacdd9591f825ed86e9bffd0e8 (diff) | |
| download | mariadb-git-1387e71531495b1224bfafd6867ae5fae9cf469c.tar.gz | |
MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
merged from 5.6:
Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING
Bug#16589511: MYSQL_UPGRADE FAILS TO WRITE OUT ENTIRE ALTER TABLE ... ALGORITHM= ... STATEMENT
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN DOWNGRADED FROM 5.6.11 TO 5.6.10
plus minor changes from 5.6, mainly comments
Diffstat (limited to 'sql/key.h')
| -rw-r--r-- | sql/key.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/key.h b/sql/key.h index c8b3ad997fb..ba3102947b3 100644 --- a/sql/key.h +++ b/sql/key.h @@ -32,7 +32,9 @@ void key_copy(uchar *to_key, uchar *from_record, KEY *key_info, uint key_length, void key_restore(uchar *to_record, uchar *from_key, KEY *key_info, uint key_length); bool key_cmp_if_same(TABLE *form,const uchar *key,uint index,uint key_length); -void key_unpack(String *to, TABLE *form, KEY *key); +void key_unpack(String *to, TABLE *table, KEY *key); +void field_unpack(String *to, Field *field, const uchar *rec, uint max_length, + bool prefix_key); bool is_key_used(TABLE *table, uint idx, const MY_BITMAP *fields); int key_cmp(KEY_PART_INFO *key_part, const uchar *key, uint key_length); ulong key_hashnr(KEY *key_info, uint used_key_parts, const uchar *key); |