summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-05-10 15:06:35 -0600
committersasha@mysql.sashanet.com <>2001-05-10 15:06:35 -0600
commit7c9b9f471c86c53f8a55ec4a249499cf2fb6bab3 (patch)
tree32fd0eb2c34334b7806726cf2dc9f8a893ea6fc8 /sql/mysql_priv.h
parent8e882bcafa9daf15f77718f29ab8cdc344e4ee27 (diff)
parent4e04aa4abd0e540e6ce5cd48f2057ae993ee3336 (diff)
downloadmariadb-git-7c9b9f471c86c53f8a55ec4a249499cf2fb6bab3.tar.gz
Merged with 3.23, needs further fix-up
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 2c4ad21de95..3fdc50b1521 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -614,7 +614,8 @@ void init_read_record(READ_RECORD *info, THD *thd, TABLE *reg_form,
int use_record_cache, bool print_errors);
void end_read_record(READ_RECORD *info);
ha_rows filesort(TABLE **form,struct st_sort_field *sortorder, uint s_length,
- SQL_SELECT *select, ha_rows special,ha_rows max_rows);
+ SQL_SELECT *select, ha_rows special,ha_rows max_rows,
+ ha_rows *examined_rows);
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);