Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

2 files changed, 54 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",
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 91927e44e49..0a93fe60990 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -603,6 +603,57 @@ mysql_connect(MYSQL *mysql,const char *host,
 #endif
 
 
+#ifdef CHECK_LICENSE
+/*
+  Check server side variable 'license'.
+  If the variable does not exist or does not contain 'Commercial', 
+  we're talking to non-commercial server from commercial client.
+  SYNOPSIS
+    check_license()
+  RETURN VALUE
+    0  success
+   !0  network error or the server is not commercial.
+       Error code is saved in mysql->net.last_errno.
+*/
+
+static int check_license(MYSQL *mysql)
+{
+  MYSQL_ROW row;
+  MYSQL_RES *res;
+  NET *net= &mysql->net;
+  static const char query[]= "SELECT @@license";
+  static const char required_license[]= LICENSE;
+
+  if (mysql_real_query(mysql, query, sizeof(query)-1))
+  {
+    if (net->last_errno == ER_UNKNOWN_SYSTEM_VARIABLE)
+    {
+      net->last_errno= CR_WRONG_LICENSE;
+      sprintf(net->last_error, ER(net->last_errno), required_license);
+    }
+    return 1;
+  }
+  if (!(res= mysql_use_result(mysql)))
+    return 1;
+  row= mysql_fetch_row(res);
+  /* 
+    If no rows in result set, or column value is NULL (none of these
+    two is ever true for server variables now), or column value
+    mismatch, set wrong license error.
+  */
+  if (!net->last_errno &&
+      (!row || !row[0] ||
+       strncmp(row[0], required_license, sizeof(required_license))))
+  {
+    net->last_errno= CR_WRONG_LICENSE;
+    sprintf(net->last_error, ER(net->last_errno), required_license);
+  }
+  mysql_free_result(res);
+  return net->last_errno;
+}
+#endif /* CHECK_LICENSE */
+
+
 /**************************************************************************
   Change user and database
 **************************************************************************/