database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

few more fixes - fix makefile and get rid of strncasecmp in favour of

Browse Source 
my_strnncoll
This commit is contained in:
petr@mysql.com
2004-11-06 23:18:28 +03:00
parent b2e3626e52
commit 4f62e8b9d6
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/Makefile.am
View File

@ -42,7 +42,7 @@ liboptions_a_SOURCES= options.h options.cc priv.h priv.cc
# MySQL sometimes uses symlinks to reuse code # MySQL sometimes uses symlinks to reuse code
# All symlinked files are grouped in libnet.a # All symlinked files are grouped in libnet.a
nodist_libnet_a_SOURCES= net_serv.cc client.c errmsg.c nodist_libnet_a_SOURCES= net_serv.cc client_settings.h client.c errmsg.c
libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
$(top_builddir)/sql/pack.$(OBJEXT) \ $(top_builddir)/sql/pack.$(OBJEXT) \
$(top_builddir)/sql/sql_state.$(OBJEXT) $(top_builddir)/sql/sql_state.$(OBJEXT)

27
server-tools/instance-manager/parse.cc
View File

@ -31,15 +31,21 @@ enum Token
TOK_END TOK_END
}; };
static const char *tokens[]= { struct tokens_st
"FLUSH", {
"INSTANCE", uint length;
"INSTANCES", const char *tok_name;
"OPTIONS", };
"START",
"STATUS", static struct tokens_st tokens[]= {
"STOP", {5, "FLUSH"},
"SHOW", {8, "INSTANCE"},
{9, "INSTANCES"},
{7, "OPTIONS"},
{5, "START"},
{6, "STATUS"},
{4, "STOP"},
{4, "SHOW"}
}; };
@ -76,7 +82,8 @@ inline Token find_token(const char *word, uint word_len)
int i= 0; int i= 0;
do do
{ {
if (strncasecmp(tokens[i], word, word_len) == 0) if (my_strnncoll(default_charset_info, (const uchar *) tokens[i].tok_name,
tokens[i].length, (const uchar *) word, word_len) == 0)
break; break;
} }
while (++i < TOK_NOT_FOUND); while (++i < TOK_NOT_FOUND);