diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-06 19:53:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-06 19:53:55 +0200 |
| commit | 1ddfce4840994b6b79a3f426fcedf8f0469334ac (patch) | |
| tree | 4a5700c90dacb63f00a8d130e94ba0398b2ee371 /strings | |
| parent | c0977073e18d070810c20026defc63794154e288 (diff) | |
| parent | 3139aa87b4f215418740939cc8d156150c355823 (diff) | |
| download | mariadb-git-1ddfce4840994b6b79a3f426fcedf8f0469334ac.tar.gz | |
mysql-5.5.40
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-mb.c | 4 | ||||
| -rw-r--r-- | strings/decimal.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 9f845511866..519e93471ea 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. Copyright (c) 2009, 2014, SkySQL Ab. This program is free software; you can redistribute it and/or modify @@ -1043,7 +1043,7 @@ static int my_wildcmp_mb_bin_impl(CHARSET_INFO *cs, } if (*wildstr == w_many) { /* Found w_many */ - uchar cmp; + int cmp; const char* mb = wildstr; int mb_len=0; 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) |