diff options
| author | unknown <bar@mysql.com> | 2006-03-23 10:17:31 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-23 10:17:31 +0400 |
| commit | 859aa2f24fb31d5b88c219c7b21e6ddd4977bf0d (patch) | |
| tree | f67ced96c47bc0443f97364dc84030799a4e4e9b /strings | |
| parent | 4399da26b4f5f169c2264ad8bd3579f86f926522 (diff) | |
| parent | 83bc8c4e389305290cae4b9ed7fc89f9a348eb44 (diff) | |
| download | mariadb-git-859aa2f24fb31d5b88c219c7b21e6ddd4977bf0d.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b17374
into mysql.com:/usr/home/bar/mysql-5.0
include/m_ctype.h:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-bin.c | 8 | ||||
| -rw-r--r-- | strings/ctype-czech.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 973a6ebf12a..9708257c1b5 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -295,10 +295,10 @@ void my_hash_sort_bin(CHARSET_INFO *cs __attribute__((unused)), #define INC_PTR(cs,A,B) (A)++ -static int my_wildcmp_bin(CHARSET_INFO *cs, - const char *str,const char *str_end, - const char *wildstr,const char *wildend, - int escape, int w_one, int w_many) +int my_wildcmp_bin(CHARSET_INFO *cs, + const char *str,const char *str_end, + const char *wildstr,const char *wildend, + int escape, int w_one, int w_many) { int result= -1; /* Not found, using wildcards */ diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c index fa3a3bf53fe..8f65825ece5 100644 --- a/strings/ctype-czech.c +++ b/strings/ctype-czech.c @@ -595,7 +595,7 @@ static MY_COLLATION_HANDLER my_collation_latin2_czech_ci_handler = my_strnxfrm_czech, my_strnxfrmlen_simple, my_like_range_czech, - my_wildcmp_8bit, + my_wildcmp_bin, my_strcasecmp_8bit, my_instr_simple, my_hash_sort_simple, |