diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-08 19:26:11 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-08 19:26:11 -0600 |
| commit | 9de8ae5fd0285c3ed33c980f2275a5ac39f47f9c (patch) | |
| tree | 2686922d9044bcd3e7b746e168c2560b74ed3ed3 /libmysql/errmsg.c | |
| parent | 2db2a22cbfa92fcd38a2615762c2dea8e23c09f7 (diff) | |
| parent | 26ffc5d4dec03f804ea36a2f5915acdbc9c1f705 (diff) | |
| download | mariadb-git-9de8ae5fd0285c3ed33c980f2275a5ac39f47f9c.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
mysql-test/mysql-test-run.sh:
Auto merged
client/mysqltest.c:
Auto merged
Diffstat (limited to 'libmysql/errmsg.c')
| -rw-r--r-- | libmysql/errmsg.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 71fc25fd77c..f0a1692453a 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -16,7 +16,7 @@ MA 02111-1307, USA */ /* Error messages for MySQL clients */ -/* error messages for the demon is in share/language/errmsg.sys */ +/* error messages for the daemon is in share/language/errmsg.sys */ #include <global.h> #include <my_sys.h> @@ -47,6 +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" }; /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */ @@ -76,6 +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" }; #else /* ENGLISH */ @@ -102,7 +110,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 |