summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-06-10 22:30:49 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-06-10 22:30:49 -0300
commitdb2fe44c844e969405095220287ea98a57f33284 (patch)
tree7aee99151209c7e83d2cf2ec0b242e6827f8c55f /strings
parent90343dd788471cbc384f7f11b7d48fc474ece4c5 (diff)
parent0f9ddfa9d8bb8d071266bcc63e92813cf18ccd2b (diff)
downloadmariadb-git-db2fe44c844e969405095220287ea98a57f33284.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'strings')
-rw-r--r--strings/decimal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/decimal.c b/strings/decimal.c
index 42dc33e5ac6..99b7ccd3249 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -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);
}