summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-12-09 16:33:48 +0100
committerSergei Golubchik <serg@mariadb.org>2016-12-09 16:33:48 +0100
commit3e8155c637096da8fd019c42b78746be2bf89944 (patch)
tree7df7880c789de7c32fdd76e862170322afe6117c /strings
parent106664f8e86d694a9898c3e564bb72290f221bd6 (diff)
parent03dabfa84d6bc9a8197c8d9fbe80f2a7f6a5b6ac (diff)
downloadmariadb-git-3e8155c637096da8fd019c42b78746be2bf89944.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'strings')
-rw-r--r--strings/decimal.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/strings/decimal.c b/strings/decimal.c
index 2353a8aefce..c6898cd099f 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -928,6 +928,8 @@ internal_str2dec(const char *from, decimal_t *to, char **end, my_bool fixed)
error= decimal_shift(to, (int) exponent);
}
}
+ if (to->sign && decimal_is_zero(to))
+ to->sign= 0;
return error;
fatal_error: