diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
| commit | fc3b3a0a864fd142f65bbd5ff611d2f09041a258 (patch) | |
| tree | 94027c861a0c3fd6ad62c4bee7ae5f7b1088f056 /sql/my_decimal.cc | |
| parent | 2ff938d21c596d1769076d2703b22120d2cf8336 (diff) | |
| parent | 088e2395f1833f16c2ea3f7405f604165b4aa2cc (diff) | |
| download | mariadb-git-fc3b3a0a864fd142f65bbd5ff611d2f09041a258.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'sql/my_decimal.cc')
| -rw-r--r-- | sql/my_decimal.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index 8823fac3393..1f0ebf32795 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -118,7 +118,7 @@ int my_decimal2string(uint mask, const my_decimal *d, E_DEC_OVERFLOW */ -int my_decimal2binary(uint mask, const my_decimal *d, char *bin, int prec, +int my_decimal2binary(uint mask, const my_decimal *d, uchar *bin, int prec, int scale) { int err1= E_DEC_OK, err2; @@ -244,7 +244,7 @@ print_decimal(const my_decimal *dec) /* print decimal with its binary representation */ void -print_decimal_buff(const my_decimal *dec, const byte* ptr, int length) +print_decimal_buff(const my_decimal *dec, const uchar* ptr, int length) { print_decimal(dec); fprintf(DBUG_FILE, "Record: "); |