diff options
| author | sasha@mysql.sashanet.com <> | 2001-06-08 21:26:59 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-06-08 21:26:59 -0600 |
| commit | 697f4d5a8cbf7786d7d4b23049bd583c0f20a298 (patch) | |
| tree | 9d44a5c80393566852a5cdb742068eac9ed99a2f /client | |
| parent | a6788beace6a020db7a0c28a402637b459aa4bf6 (diff) | |
| download | mariadb-git-697f4d5a8cbf7786d7d4b23049bd583c0f20a298.tar.gz | |
fixed new error messages and got vio to compile
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 2 | ||||
| -rw-r--r-- | client/errmsg.c | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 408fa360e67..6766b389704 100644 --- a/client/Makefile.am +++ b/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 diff --git a/client/errmsg.c b/client/errmsg.c index e0e09387e88..9f67a15dcb2 100644 --- a/client/errmsg.c +++ b/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[]= "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:", + "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 |