1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed C++ syntax in C code

Browse Source 
fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory
This commit is contained in:
bell@sanja.is.com.ua 2005-02-09 11:35:22 +02:00
parent 96558f6ad3
commit 7df94d5e9b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -1059,3 +1059,4 @@ support-files/ndb-config-2-node.ini
client/decimal.c client/decimal.c
client/my_decimal.cc client/my_decimal.cc
client/my_decimal.h client/my_decimal.h
libmysqld/my_decimal.cc

2
sql/my_decimal.cc
View File

@ -171,7 +171,7 @@ int str2my_decimal(uint mask, const char *from, uint length,
} }
my_decimal_set_zero(decimal_value); my_decimal_set_zero(decimal_value);
err= string2decimal((char *)from, (decimal *)decimal_value, &end); err= string2decimal((char *)from, (decimal *)decimal_value, &end);
if (*end && !err) if ((end-from) != length && !err)
err= E_DEC_TRUNCATED; err= E_DEC_TRUNCATED;
check_result(mask, err); check_result(mask, err);
return err; return err;

9
strings/decimal.c
View File

@ -686,12 +686,13 @@ int decimal_shift(decimal *dec, int shift)
{ {
/* need to move digits */ /* need to move digits */
int d_shift; int d_shift;
dec1 *to, *barier;
if (new_front > 0) if (new_front > 0)
{ {
/* move left */ /* move left */
d_shift= new_front / DIG_PER_DEC1; d_shift= new_front / DIG_PER_DEC1;
dec1 *to= dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift); to= dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift);
dec1 *barier= dec->buf + (ROUND_UP(end) - 1 - d_shift); barier= dec->buf + (ROUND_UP(end) - 1 - d_shift);
DBUG_ASSERT(to >= dec->buf); DBUG_ASSERT(to >= dec->buf);
DBUG_ASSERT(barier + d_shift < dec->buf + dec->len); DBUG_ASSERT(barier + d_shift < dec->buf + dec->len);
for(; to <= barier; to++) for(; to <= barier; to++)
@ -704,8 +705,8 @@ int decimal_shift(decimal *dec, int shift)
{ {
/* move right */ /* move right */
d_shift= (1 - new_front) / DIG_PER_DEC1; d_shift= (1 - new_front) / DIG_PER_DEC1;
dec1 *to= dec->buf + ROUND_UP(end) - 1 + d_shift; to= dec->buf + ROUND_UP(end) - 1 + d_shift;
dec1 *barier= dec->buf + ROUND_UP(beg + 1) - 1 + d_shift; barier= dec->buf + ROUND_UP(beg + 1) - 1 + d_shift;
DBUG_ASSERT(to < dec->buf + dec->len); DBUG_ASSERT(to < dec->buf + dec->len);
DBUG_ASSERT(barier - d_shift >= dec->buf); DBUG_ASSERT(barier - d_shift >= dec->buf);
for(; to >= barier; to--) for(; to >= barier; to--)