fixed new error messages and got vio to compile

client/Makefile.am:
  cleanup to make vio compile
client/errmsg.c:
  cleanup
libmysql/Makefile.am:
  vio fix
libmysql/Makefile.shared:
  vio fix
libmysql/errmsg.c:
  fixed up messages

client/Makefile.am

@@ -20,7 +20,7 @@ INCLUDES =			-I$(srcdir)/../include \
 				-I../include -I$(srcdir)/.. -I$(top_srcdir) \
 				-I..
 LIBS =				@CLIENT_LIBS@
-LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la ../vio/libvio.a 
+LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la 
 bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow mysqldump mysqlimport mysqltest
 noinst_PROGRAMS =		insert_test select_test thread_test
 noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h

client/errmsg.c

@@ -46,7 +46,12 @@ const char *client_errors[]=
   "Kann den Status der Named Pipe nicht setzen.  Host: %-.64s  pipe: %-.32s (%lu)",
   "Can't initialize character set %-.64s (path: %-.64s)",
   "Got packet bigger than 'max_allowed_packet'",
-  "Embedded server"
+  "Embedded server",
+  "Error on SHOW SLAVE STATUS:",
+  "Error on SHOW SLAVE HOSTS:",
+  "Error connecting to slave:",
+  "Error connecting to master:"
+
 };
 
 /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
@@ -76,6 +81,10 @@ const char *client_errors[]=
   "No pode inicializar conjunto de caracteres %-.64s (caminho %-.64s)",
   "Obteve pacote maior do que 'max_allowed_packet'",
   "Embedded server",
+  "Error on SHOW SLAVE STATUS:",
+  "Error on SHOW SLAVE HOSTS:",
+  "Error connecting to slave:",
+  "Error connecting to master:"
 };
 
 #else /* ENGLISH */
@@ -102,7 +111,11 @@ const char *client_errors[]=
   "Can't set state of named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't initialize character set %-.64s (path: %-.64s)",
   "Got packet bigger than 'max_allowed_packet'",
-  "Embedded server"
+  "Embedded server",
+  "Error on SHOW SLAVE STATUS:",
+  "Error on SHOW SLAVE HOSTS:",
+  "Error connecting to slave:",
+  "Error connecting to master:"
 };
 #endif
 

libmysql/Makefile.am

@@ -36,10 +36,15 @@ link_sources:
 	  ss=`echo $(mystringsobjects) | sed "s;\.lo;.c;g"`; \
 	  ds=`echo $(dbugobjects) | sed "s;\.lo;.c;g"`; \
 	  ms=`echo $(mysysobjects) | sed "s;\.lo;.c;g"`; \
+	  vs=`echo $(vio_objects) | sed "s;\.lo;.c;g"`; \
 	  for f in $$ss; do \
 	    rm -f $(srcdir)/$$f; \
 	    @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
 	  done; \
+	  for f in $$vs; do \
+	    rm -f $(srcdir)/$$f; \
+	    @LN_CP_F@ $(srcdir)/../vio/$$f $(srcdir)/$$f; \
+	  done; \
 	  for f in $(mystringsextra); do \
 	    rm -f $(srcdir)/$$f; \
 	    @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \

libmysql/Makefile.shared

@@ -59,8 +59,10 @@ mysysobjects1 =		my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
 # Not needed in the minimum library
 mysysobjects2 =		getopt.lo getopt1.lo getvar.lo my_lib.lo
 mysysobjects =		$(mysysobjects1) $(mysysobjects2)
-target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects)
+target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \
+ $(vio_objects)
 target_ldflags = -version-info @SHARED_LIB_VERSION@
+vio_objects= vio.lo viosocket.lo
 CLEANFILES =		$(target_libadd) $(SHLIBOBJS) \
 			$(target)
 DEFS =			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
@@ -75,6 +77,7 @@ clean-local:
 	rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
 	      `echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
 	      `echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
+	      `echo $(vio_objects) | sed "s;\.lo;.c;g"` \
 	       $(mystringsextra) $(mysysheaders) ctype_extra_sources.c \
 	       ../linked_client_sources
 

libmysql/errmsg.c

@@ -47,10 +47,10 @@ const char *client_errors[]=
   "Can't initialize character set %-.64s (path: %-.64s)",
   "Got packet bigger than 'max_allowed_packet'",
   "Embedded server",
-  "Error on SHOW SLAVE STATUS: %-.64s",
-  "Error on SHOW SLAVE HOSTS: %-.64s",
-  "Error connecting to slave: %-.64s",
-  "Error connecting to master: %-.64s"
+  "Error on SHOW SLAVE STATUS:",
+  "Error on SHOW SLAVE HOSTS:",
+  "Error connecting to slave:",
+  "Error connecting to master:"
 };
 
 /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
@@ -80,10 +80,10 @@ const char *client_errors[]=
   "No pode inicializar conjunto de caracteres %-.64s (caminho %-.64s)",
   "Obteve pacote maior do que 'max_allowed_packet'",
   "Embedded server"
-  "Error on SHOW SLAVE STATUS: %-.64s",
-  "Error on SHOW SLAVE HOSTS: %-.64s",
-  "Error connecting to slave: %-.64s",
-  "Error connecting to master: %-.64s"
+  "Error on SHOW SLAVE STATUS:",
+  "Error on SHOW SLAVE HOSTS:",
+  "Error connecting to slave:",
+  "Error connecting to master:"
 };
 
 #else /* ENGLISH */