database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for bug #8534 (Compile errors in Precision Math code on Windows)

Browse Source
This commit is contained in:
hf@deer.(none)
2005-02-16 11:44:34 +04:00
parent 48ff0f4c5e
commit d75c9dc1d8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/filesort.cc
View File

@ -719,7 +719,7 @@ static void make_sortkey(register SORTPARAM *param,
} }
*to++=1; *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->max_length - (item->decimals ? 1:0),
item->decimals); item->decimals);
break; break;

2
sql/my_decimal.cc
View File

@ -116,7 +116,7 @@ int my_decimal2string(uint mask, const my_decimal *d,
E_DEC_OVERFLOW 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 scale)
{ {
int err1= E_DEC_OK, err2; int err1= E_DEC_OK, err2;

4
sql/my_decimal.h
View File

@ -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); int scale);
inline 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) int scale)
{ {
return check_result(mask, bin2decimal((char *)bin, (decimal *)d, prec, return check_result(mask, bin2decimal((char *)bin, (decimal *)d, prec,