diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-09-14 09:12:47 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-09-14 09:12:47 +0500 |
| commit | 4fd663b896bbbc22ff5b1aba805e460dfcc3d4e6 (patch) | |
| tree | 675f76ed44e10cc3a6790ad57b049fdfa0401895 /strings | |
| parent | d2f7fe35584a75d5bc3a9a6950cc15d264e31241 (diff) | |
| parent | ec2512cf184c6746df48e2dfd5f493c3278e393a (diff) | |
| download | mariadb-git-4fd663b896bbbc22ff5b1aba805e460dfcc3d4e6.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b20471v2
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-win1250ch.c | 4 | ||||
| -rw-r--r-- | strings/strtod.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c index e936ef1d423..b03bbbc155c 100644 --- a/strings/ctype-win1250ch.c +++ b/strings/ctype-win1250ch.c @@ -634,11 +634,11 @@ my_like_range_win1250ch(CHARSET_INFO *cs __attribute__((unused)), ptr++; /* Skip escape */ else if (*ptr == w_one || *ptr == w_many) /* '_' or '%' in SQL */ break; - *min_str = like_range_prefix_min_win1250ch[(uint)(*ptr)]; + *min_str = like_range_prefix_min_win1250ch[(uint) (uchar) (*ptr)]; if (*min_str != min_sort_char) only_min_found= 0; min_str++; - *max_str++ = like_range_prefix_max_win1250ch[(uint)(*ptr)]; + *max_str++ = like_range_prefix_max_win1250ch[(uint) (uchar) (*ptr)]; } *min_length = (uint) (min_str - min_org); diff --git a/strings/strtod.c b/strings/strtod.c index da1b4f4baa6..1663cd61b78 100644 --- a/strings/strtod.c +++ b/strings/strtod.c @@ -26,7 +26,7 @@ */ -#include <my_global.h> /* Includes errno.h */ +#include <my_base.h> /* Includes errno.h */ #include <m_ctype.h> #define MAX_DBL_EXP 308 |