mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 14:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

post-merge fixes.

Browse source 
most tests pass.
5.3 merge is next
This commit is contained in:
Sergei Golubchik 2011-07-02 22:12:12 +02:00
commit b4a0b2c2f8
221 changed files with 2067 additions and 1877 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/sql_analyse.cc
View file

@ -409,7 +409,7 @@ void field_real::add()
if ((decs = decimals()) == NOT_FIXED_DEC)
{
length= my_sprintf(buff, (buff, "%g", num));
length= sprintf(buff, "%g", num);
if (rint(num) != num)
max_notzero_dec_len = 1;
}
@ -420,7 +420,7 @@ void field_real::add()
snprintf(buff, sizeof(buff)-1, "%-.*f", (int) decs, num);
length = (uint) strlen(buff);
#else
length= my_sprintf(buff, (buff, "%-.*f", (int) decs, num));
length= sprintf(buff, "%-.*f", (int) decs, num);
#endif
// We never need to check further than this
@ -1002,9 +1002,9 @@ void field_decimal::get_opt_type(String *answer,
my_decimal_set_zero(&zero);
my_bool is_unsigned= (my_decimal_cmp(&zero, &min_arg) >= 0);
length= my_sprintf(buff, (buff, "DECIMAL(%d, %d)",
(int) (max_length - (item->decimals ? 1 : 0)),
item->decimals));
length= sprintf(buff, "DECIMAL(%d, %d)",
(int) (max_length - (item->decimals ? 1 : 0)),
item->decimals);
if (is_unsigned)
length= (uint) (strmov(buff+length, " UNSIGNED")- buff);
answer->append(buff, length);