diff options
| author | unknown <kaa@polly.local> | 2007-04-28 20:26:14 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-04-28 20:26:14 +0400 |
| commit | ac86892f72acc407a6e0fff7af2bd8e7d2c750c4 (patch) | |
| tree | 49453d89159d8dbdffe5b970dc54cf197c85ca9f /sql/mysql_priv.h | |
| parent | fef06223af7779bcafb2c37977c1ffb525ea7bd8 (diff) | |
| parent | 38090df9b566da89942f8a90fe71a3fac31efb9d (diff) | |
| download | mariadb-git-ac86892f72acc407a6e0fff7af2bd8e7d2c750c4.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7e873dd7cc6..7ab683134e0 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1539,7 +1539,8 @@ ha_rows filesort(THD *thd, TABLE *form,struct st_sort_field *sortorder, ha_rows max_rows, ha_rows *examined_rows); void filesort_free_buffers(TABLE *table, bool full); void change_double_for_sort(double nr,byte *to); -double my_double_round(double value, int dec, bool truncate); +double my_double_round(double value, longlong dec, bool dec_unsigned, + bool truncate); int get_quick_record(SQL_SELECT *select); int calc_weekday(long daynr,bool sunday_first_day_of_week); uint calc_week(TIME *l_time, uint week_behaviour, uint *year); |