summaryrefslogtreecommitdiff
path: root/strings/decimal.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-10-06 19:53:55 +0200
committerSergei Golubchik <sergii@pisem.net>2014-10-06 19:53:55 +0200
commit1ddfce4840994b6b79a3f426fcedf8f0469334ac (patch)
tree4a5700c90dacb63f00a8d130e94ba0398b2ee371 /strings/decimal.c
parentc0977073e18d070810c20026defc63794154e288 (diff)
parent3139aa87b4f215418740939cc8d156150c355823 (diff)
downloadmariadb-git-1ddfce4840994b6b79a3f426fcedf8f0469334ac.tar.gz
mysql-5.5.40
Diffstat (limited to 'strings/decimal.c')
-rw-r--r--strings/decimal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/decimal.c b/strings/decimal.c
index b36025ee8fc..49b12f14dbf 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates.
- Copyright (c) 2009, 2011, Monty Program Ab.
+/* Copyright (c) 2004, 2014, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2014, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2328,7 +2328,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
error=E_DEC_TRUNCATED;
goto done;
}
- stop1=start1+frac0;
+ stop1= start1 + frac0 + intg0;
frac0+=intg0;
to->intg=0;
while (intg0++ < 0)