summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2004-03-17 20:04:50 +0300
committerunknown <konstantin@mysql.com>2004-03-17 20:04:50 +0300
commit1b8f005859801120b9bb2ca24a35254198c193f9 (patch)
treeb125698d0619b2d35f6b0b36ad5b7aa33826012b /sql
parente4e4166e9358e5720f0a352b405b658b4f89d954 (diff)
downloadmariadb-git-1b8f005859801120b9bb2ca24a35254198c193f9.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 'sql')
-rw-r--r--sql/set_var.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 71c0865dd91..eb94ad2ebf6 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -334,14 +334,12 @@ static sys_var_rand_seed2 sys_rand_seed2("rand_seed2");
static sys_var_thd_ulong sys_default_week_format("default_week_format",
&SV::default_week_format);
-static const char license[]= "GPL";
/* Read only variables */
sys_var_const_str sys_os("version_compile_os", SYSTEM_TYPE);
-sys_var_const_str sys_license("license", license);
-
/* Global read-only variable describing server license */
+sys_var_const_str sys_license("license", LICENSE);