diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /strings/decimal.c | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'strings/decimal.c')
| -rw-r--r-- | strings/decimal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index c64fe189565..325615147c8 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -2248,7 +2248,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2, */ norm_factor=DIG_BASE/(*start2+1); norm2=(dec1)(norm_factor*start2[0]); - if (likely(len2>0)) + if (unlikely(len2>0)) norm2+=(dec1)(norm_factor*start2[1]/DIG_BASE); if (*start1 < *start2) @@ -2270,7 +2270,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2, guess=(norm_factor*x+norm_factor*y/DIG_BASE)/norm2; if (unlikely(guess >= DIG_BASE)) guess=DIG_BASE-1; - if (likely(len2>0)) + if (unlikely(len2>0)) { /* hmm, this is a suspicious trick - I removed normalization here */ if (start2[1]*guess > (x-guess*start2[0])*DIG_BASE+y) |