diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 12:03:29 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 12:03:29 +0400 |
| commit | e557d8a5fd2cc88239f1414acc0f6a38dea91acd (patch) | |
| tree | dc0d028fe3a0c606151fe9522068bfe1a88e8e9e /strings | |
| parent | 50af230e655b773bd1024c8f575ac923ceb7b89b (diff) | |
| parent | 5962cadcfae4f8b7842578ab308798a9b5295a32 (diff) | |
| download | mariadb-git-e557d8a5fd2cc88239f1414acc0f6a38dea91acd.tar.gz | |
Manual merge from mysql-5.5.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/decimal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index da5888e7b0d..b18a8c3fa50 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -2182,7 +2182,6 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2, } buf0=to->buf; stop0=buf0+intg0+frac0; - DBUG_ASSERT(stop0 <= &to->buf[to->len]); if (likely(div_mod)) while (dintg++ < 0 && buf0 < &to->buf[to->len]) { @@ -2277,7 +2276,10 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2, } } if (likely(div_mod)) + { + DBUG_ASSERT(buf0 < to->buf + to->len); *buf0=(dec1)guess; + } dcarry= *start1; start1++; } |