1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge of mysql-5.1-bugteam into mysql-trunk-merge.

This commit is contained in:
Davi Arnaut
2010-06-10 22:30:49 -03:00
61 changed files with 1018 additions and 913 deletions

View File

@ -952,12 +952,12 @@ int decimal2double(decimal_t *from, double *to)
rc = decimal2string(from, strbuf, &len, 0, 0, 0);
end= strbuf + len;
DBUG_PRINT("info", ("interm.: %s", strbuf));
*to= my_strtod(strbuf, &end, &error);
DBUG_PRINT("info", ("result: %f (%lx)", *to, *(ulong *)to));
DBUG_PRINT("info", ("result: %f", *to));
return (rc != E_DEC_OK) ? rc : (error ? E_DEC_OVERFLOW : E_DEC_OK);
}