diff options
| author | unknown <hf@deer.(none)> | 2005-02-16 11:44:34 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-02-16 11:44:34 +0400 |
| commit | 7b322d676043240bca4f1143cbd924549cc80538 (patch) | |
| tree | 657cf712c3f8b6473c8d92600b88c868c5a44764 /sql | |
| parent | ae751df48b80d5439f461c9c642d9793d5c99a6f (diff) | |
| download | mariadb-git-7b322d676043240bca4f1143cbd924549cc80538.tar.gz | |
Fix for bug #8534 (Compile errors in Precision Math code on Windows)
sql/filesort.cc:
Type of the parameter changed
sql/my_decimal.cc:
type of the parameter changed
sql/my_decimal.h:
Parameter type changed
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/filesort.cc | 2 | ||||
| -rw-r--r-- | sql/my_decimal.cc | 2 | ||||
| -rw-r--r-- | sql/my_decimal.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index c05baa7cc04..de14287003b 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -719,7 +719,7 @@ static void make_sortkey(register SORTPARAM *param, } *to++=1; } - my_decimal2binary(E_DEC_FATAL_ERROR, dec_val, (byte*)to, + my_decimal2binary(E_DEC_FATAL_ERROR, dec_val, (char*)to, item->max_length - (item->decimals ? 1:0), item->decimals); break; diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index f028b1fa1a1..36229d1c795 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -116,7 +116,7 @@ int my_decimal2string(uint mask, const my_decimal *d, E_DEC_OVERFLOW */ -int my_decimal2binary(uint mask, const my_decimal *d, byte *bin, int prec, +int my_decimal2binary(uint mask, const my_decimal *d, char *bin, int prec, int scale) { int err1= E_DEC_OK, err2; diff --git a/sql/my_decimal.h b/sql/my_decimal.h index 63d3fb7e2e5..f4841418074 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -150,12 +150,12 @@ void my_decimal2decimal(const my_decimal *from, my_decimal *to) } -int my_decimal2binary(uint mask, const my_decimal *d, byte *bin, int prec, +int my_decimal2binary(uint mask, const my_decimal *d, char *bin, int prec, int scale); inline -int binary2my_decimal(uint mask, const byte *bin, my_decimal *d, int prec, +int binary2my_decimal(uint mask, const char *bin, my_decimal *d, int prec, int scale) { return check_result(mask, bin2decimal((char *)bin, (decimal *)d, prec, |