mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
post-merge fixes.
most tests pass. 5.3 merge is next
This commit is contained in:
@@ -96,7 +96,6 @@ bool check_partition_info(partition_info *part_info,handlerton **eng_type,
|
||||
TABLE *table, handler *file, HA_CREATE_INFO *info);
|
||||
void set_linear_hash_mask(partition_info *part_info, uint num_parts);
|
||||
bool fix_partition_func(THD *thd, TABLE *table, bool create_table_ind);
|
||||
bool partition_key_modified(TABLE *table, const MY_BITMAP *fields);
|
||||
void get_partition_set(const TABLE *table, uchar *buf, const uint index,
|
||||
const key_range *key_spec,
|
||||
part_id_range *part_spec);
|
||||
@@ -269,6 +268,9 @@ char *generate_partition_syntax(partition_info *part_info,
|
||||
bool show_partition_options,
|
||||
HA_CREATE_INFO *create_info,
|
||||
Alter_info *alter_info);
|
||||
bool partition_key_modified(TABLE *table, const MY_BITMAP *fields);
|
||||
#else
|
||||
#define partition_key_modified(X,Y) 0
|
||||
#endif
|
||||
|
||||
void create_partition_name(char *out, const char *in1,
|
||||
|
||||
Reference in New Issue
Block a user