diff options
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 93cbf130f18..f9b69124dbe 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -41,7 +41,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ strcend.lo bcmp.lo \ bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \ strtoull.lo strtoll.lo llstr.lo \ - ctype.lo $(LTCHARSET_OBJS) + ctype.lo ctype-simple.lo ctype-mb.lo $(LTCHARSET_OBJS) mystringsextra= strto.c dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo mysysheaders = mysys_priv.h my_static.h diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 4e4518bbe10..c3ef33296b1 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1282,8 +1282,8 @@ STDCALL mysql_rpl_query_type(const char* q, int len) for(; q < q_end; ++q) { char c; - if (isalpha(c=*q)) - switch(tolower(c)) + if (my_isalpha(system_charset_info,c=*q)) + switch(my_tolower(system_charset_info,c)) { case 'i': /* insert */ case 'u': /* update or unlock tables */ @@ -1292,9 +1292,11 @@ STDCALL mysql_rpl_query_type(const char* q, int len) case 'a': /* alter */ return MYSQL_RPL_MASTER; case 'c': /* create or check */ - return tolower(q[1]) == 'h' ? MYSQL_RPL_ADMIN : MYSQL_RPL_MASTER ; + return my_tolower(system_charset_info,q[1]) == 'h' ? MYSQL_RPL_ADMIN : + MYSQL_RPL_MASTER; case 's': /* select or show */ - return tolower(q[1]) == 'h' ? MYSQL_RPL_ADMIN : MYSQL_RPL_SLAVE; + return my_tolower(system_charset_info,q[1]) == 'h' ? MYSQL_RPL_ADMIN : + MYSQL_RPL_SLAVE; case 'f': /* flush */ case 'r': /* repair */ case 'g': /* grant */ |