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

my_strnncoll


server-tools/instance-manager/Makefile.am:
  one more makefile fix
server-tools/instance-manager/parse.cc:
  get rid of non-portable strnacasecmp

2 files changed, 18 insertions, 11 deletions

diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 4c3a772111a..d3702ba9464 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -42,7 +42,7 @@ liboptions_a_SOURCES= options.h options.cc priv.h priv.cc
 # MySQL sometimes uses symlinks to reuse code 
 # 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) \
 	$(top_builddir)/sql/pack.$(OBJEXT) \
 	$(top_builddir)/sql/sql_state.$(OBJEXT)
diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc
index 09a60062946..38e10c7f2f5 100644
--- a/server-tools/instance-manager/parse.cc
+++ b/server-tools/instance-manager/parse.cc
@@ -31,15 +31,21 @@ enum Token
   TOK_END
 };
 
-static const char *tokens[]= {
-  "FLUSH",
-  "INSTANCE",
-  "INSTANCES",
-  "OPTIONS",
-  "START",
-  "STATUS",
-  "STOP",
-  "SHOW",
+struct tokens_st
+{
+  uint length;
+  const char *tok_name;
+};
+
+static struct tokens_st tokens[]= {
+  {5, "FLUSH"},
+  {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;
   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;
   }
   while (++i < TOK_NOT_FOUND);