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

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main

Browse Source 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
This commit is contained in:
stewart@mysql.com
2005-12-28 13:55:59 +11:00
parent 986cd20a0f 76bdccd08a
commit cac298e07b
17 changed files with 352 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
strings/decimal.c
View File

@ -1075,9 +1075,9 @@ int decimal2longlong(decimal_t *from, longlong *to)
}
}
/* boundary case: 9223372036854775808 */
if (unlikely(from->sign==0 && x < 0 && -x < 0))
if (unlikely(from->sign==0 && x == LONGLONG_MIN))
{
*to= -1-x;
*to= LONGLONG_MAX;
return E_DEC_OVERFLOW;
}
@ -2681,7 +2681,8 @@ void test_pr(const char *s1, int prec, int dec, char filler, const char *orig,
int slen= sizeof(s2);
int res;
sprintf(s, "'%s', %d, %d, '%c'", s1, prec, dec, filler);
sprintf(s, filler ? "'%s', %d, %d, '%c'" : "'%s', %d, %d, '\\0'",
s1, prec, dec, filler);
end= strend(s1);
string2decimal(s1, &a, &end);
res= decimal2string(&a, s2, &slen, prec, dec, filler);