diff options
author | unknown <konstantin@mysql.com> | 2004-03-17 20:04:50 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2004-03-17 20:04:50 +0300 |
commit | c6a059964271c2b1cb7dc9905d9b708770d1278f (patch) | |
tree | b125698d0619b2d35f6b0b36ad5b7aa33826012b /libmysql/errmsg.c | |
parent | d7307566499fcb640e845231bcfa78af17cb1fc9 (diff) | |
download | mariadb-git-c6a059964271c2b1cb7dc9905d9b708770d1278f.tar.gz |
WL #1510 "Implement support for "commercial" binaries on handshake",
client library:
- implemented 'check_license' function
include/errmsg.h:
WL #1510: new error code
include/mysql_version.h.in:
WL #1510: fallback define for LICENSE
libmysql/errmsg.c:
WL #1510: error message to print in case when client and server license
mismatch.
libmysql/libmysql.c:
WL#1510: implementation of 'check_license' function
sql/set_var.cc:
removed unused variable 'license'
Diffstat (limited to 'libmysql/errmsg.c')
-rw-r--r-- | libmysql/errmsg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 7accbf8f1d2..06d21cf36c3 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -51,7 +51,8 @@ const char *client_errors[]= "Error connecting to slave:", "Error connecting to master:", "SSL connection error", - "Malformed packet" + "Malformed packet", + "This client library is licensed only for use with MySQL servers having '%s' license" }; /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */ @@ -86,7 +87,8 @@ const char *client_errors[]= "Error connecting to slave:", "Error connecting to master:", "SSL connection error", - "Malformed packet" + "Malformed packet", + "This client library is licensed only for use with MySQL servers having '%s' license" }; #else /* ENGLISH */ @@ -119,7 +121,8 @@ const char *client_errors[]= "Error connecting to slave:", "Error connecting to master:", "SSL connection error", - "Malformed packet" + "Malformed packet", + "This client library is licensed only for use with MySQL servers having '%s' license" }; #endif |