5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-01 00:54:03 +01:00
commit 59d9d08e2b
304 changed files with 12471 additions and 940 deletions

View file

@ -288,7 +288,7 @@ public:
bool check_partition_info(THD *thd, handlerton **eng_type,
handler *file, HA_CREATE_INFO *info,
bool check_partition_function);
void print_no_partition_found(TABLE *table);
void print_no_partition_found(TABLE *table, myf errflag);
void print_debug(const char *str, uint*);
Item* get_column_item(Item *item, Field *field);
int fix_partition_values(THD *thd,