diff options
| author | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
| commit | 67ea8aac5e9e9ae98a22aff063c48053ea68e5de (patch) | |
| tree | 788ab6bf4fc7ac236c7c862ab122f19dcdd83768 /libmysql/errmsg.c | |
| parent | d212d76094f83b1b7ce0692663439f3a67a432ad (diff) | |
| parent | 6b465557670093b038cb3d2be930e6a036292192 (diff) | |
| download | mariadb-git-67ea8aac5e9e9ae98a22aff063c48053ea68e5de.tar.gz | |
merge with 4.0 (to get compiler error fixes for innodb)
client/mysqltest.c:
Auto merged
include/errmsg.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/que/que0que.c:
Auto merged
mysql-test/t/rpl000009.test:
Auto merged
sql/set_var.cc:
Auto merged
libmysql/errmsg.c:
merge with 4.0
libmysql/libmysql.c:
merge with 4.0
mysql-test/mysql-test-run.sh:
merge with 4.0
mysql-test/r/rpl000009.result:
merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
merge with 4.0
sql/repl_failsafe.cc:
merge with 4.0
Diffstat (limited to 'libmysql/errmsg.c')
| -rw-r--r-- | libmysql/errmsg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index e651c13897f..ad93c1b8f9e 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -52,6 +52,7 @@ const char *client_errors[]= "Error connecting to master:", "SSL connection error", "Malformed packet", + "This client library is licensed only for use with MySQL servers having '%s' license", "Invalid use of null pointer", "Statement not prepared", "Parameters data was not supplied", @@ -110,6 +111,7 @@ const char *client_errors[]= "Error connecting to master:", "SSL connection error", "Malformed packet", + "This client library is licensed only for use with MySQL servers having '%s' license", "Invalid use of null pointer", "Statement not prepared", "Parameters data was not supplied", @@ -166,6 +168,7 @@ const char *client_errors[]= "Error connecting to master:", "SSL connection error", "Malformed packet", + "This client library is licensed only for use with MySQL servers having '%s' license", "Invalid use of null pointer", "Statement not prepared", "Not all parameters data supplied", |