bk commit into 5.0 tree (hf:1.1855) BUG#8534 -
02-16-2005
, 12:53 AM
Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/in...urce-tree.html
ChangeSet
1.1855 05/02/16 11:44:34 hf (AT) deer (DOT) (none) +3 -0
Fix for bug #8534 (Compile errors in Precision Math code on Windows)
sql/my_decimal.h
1.2 05/02/16 11:44:29 hf (AT) deer (DOT) (none) +2 -2
Parameter type changed
sql/my_decimal.cc
1.4 05/02/16 11:44:29 hf (AT) deer (DOT) (none) +1 -1
type of the parameter changed
sql/filesort.cc
1.100 05/02/16 11:44:29 hf (AT) deer (DOT) (none) +1 -1
Type of the parameter changed
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: hf
# Host: deer.(none)
# Root: /home/hf/work/mysql-5.0.clean
--- 1.99/sql/filesort.cc Tue Feb 15 18:44:56 2005
+++ 1.100/sql/filesort.cc Wed Feb 16 11:44:29 2005
@@ -719,7 +719,7 @@
}
*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;
--- 1.3/sql/my_decimal.cc Tue Feb 15 18:44:56 2005
+++ 1.4/sql/my_decimal.cc Wed Feb 16 11:44:29 2005
@@ -116,7 +116,7 @@
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;
--- 1.1/sql/my_decimal.h Wed Feb 9 02:49:37 2005
+++ 1.2/sql/my_decimal.h Wed Feb 16 11:44:29 2005
@@ -150,12 +150,12 @@
}
-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,
--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw |