diff options
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index d17faa3cea5..ea6e544a1fd 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -30,7 +30,7 @@ #undef write /* remove pthread.h macro definition for EMX */ #endif -typedef ulong table_map; /* Used for table bits in join */ +typedef ulonglong table_map; /* Used for table bits in join */ typedef ulong key_map; /* Used for finding keys */ typedef ulong key_part_map; /* Used for finding key parts */ @@ -369,7 +369,8 @@ bool do_command(THD *thd); bool dispatch_command(enum enum_server_command command, THD *thd, char* packet, uint packet_length); bool check_stack_overrun(THD *thd,char *dummy); -bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables); +bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, + bool *write_to_binlog); void table_cache_init(void); void table_cache_free(void); uint cached_tables(void); @@ -846,6 +847,7 @@ void end_read_record(READ_RECORD *info); ha_rows filesort(THD *thd, TABLE *form,struct st_sort_field *sortorder, uint s_length, SQL_SELECT *select, ha_rows max_rows, ha_rows *examined_rows); +void filesort_free_buffers(TABLE *table); void change_double_for_sort(double nr,byte *to); int get_quick_record(SQL_SELECT *select); int calc_weekday(long daynr,bool sunday_first_day_of_week); |