diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-08 21:26:59 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-08 21:26:59 -0600 |
| commit | 6cddf470868703228ccea153d85ec3899a2f5ae6 (patch) | |
| tree | 9d44a5c80393566852a5cdb742068eac9ed99a2f /libmysql | |
| parent | 9de8ae5fd0285c3ed33c980f2275a5ac39f47f9c (diff) | |
| download | mariadb-git-6cddf470868703228ccea153d85ec3899a2f5ae6.tar.gz | |
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
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 5 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 5 | ||||
| -rw-r--r-- | libmysql/errmsg.c | 16 |
3 files changed, 17 insertions, 9 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 64576fd27ed..67b78f14ba2 100644 --- a/libmysql/Makefile.am +++ b/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; \ diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 36af09d3508..4d3928c5bc5 100644 --- a/libmysql/Makefile.shared +++ b/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 diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index f0a1692453a..55e2f8164ed 100644 --- a/libmysql/errmsg.c +++ b/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[]= "Não 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 */ |