diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
| commit | 7af5094208edac1dd3af9ba2883f3c91264fbf6a (patch) | |
| tree | 89c69aad253aa731dde00030a149eadbd82193ad /sql/my_decimal.h | |
| parent | 9be9ad7b05590c3dc1ec432256f41924efa5ada0 (diff) | |
| parent | 1040f98ccffccbed8d1e95fe8252e402b8ee4e3f (diff) | |
| download | mariadb-git-7af5094208edac1dd3af9ba2883f3c91264fbf6a.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index abf4b178422..e5b1573608a 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -328,7 +328,7 @@ int my_decimal2int(uint mask, const my_decimal *d, my_bool unsigned_flag, inline -int my_decimal2double(uint mask, const my_decimal *d, double *result) +int my_decimal2double(uint, const my_decimal *d, double *result) { /* No need to call check_result as this will always succeed */ return decimal2double((decimal_t*) d, result); |