diff options
| author | msvensson@pilot.blaudden <> | 2007-03-05 10:30:05 +0100 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-03-05 10:30:05 +0100 |
| commit | 93ac2c4328dcd23c3dec06102e9427a663d8da01 (patch) | |
| tree | 75d524782edba3a354505529d62b251ce90b049d /sql/set_var.cc | |
| parent | 4367b151c2e8ef95d2ee28b897b8454aab563161 (diff) | |
| parent | d9a1208d157fc8e86afe5dfca8d41fe3936947ce (diff) | |
| download | mariadb-git-93ac2c4328dcd23c3dec06102e9427a663d8da01.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781
into pilot.blaudden:/home/msvensson/mysql/bug21781/my51-bug21781
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 732f37a64f0..10b1225349c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -674,7 +674,8 @@ sys_var_have_variable sys_have_dlopen("have_dynamic_loading", &have_dlopen); sys_var_have_variable sys_have_geometry("have_geometry", &have_geometry); sys_var_have_variable sys_have_innodb("have_innodb", &have_innodb); sys_var_have_variable sys_have_ndbcluster("have_ndbcluster", &have_ndbcluster); -sys_var_have_variable sys_have_openssl("have_openssl", &have_openssl); +sys_var_have_variable sys_have_openssl("have_openssl", &have_ssl); +sys_var_have_variable sys_have_ssl("have_ssl", &have_ssl); sys_var_have_variable sys_have_partition_db("have_partitioning", &have_partition_db); sys_var_have_variable sys_have_query_cache("have_query_cache", @@ -799,7 +800,8 @@ SHOW_VAR init_vars[]= { {sys_have_geometry.name, (char*) &have_geometry, SHOW_HAVE}, {sys_have_innodb.name, (char*) &have_innodb, SHOW_HAVE}, {sys_have_ndbcluster.name, (char*) &have_ndbcluster, SHOW_HAVE}, - {sys_have_openssl.name, (char*) &have_openssl, SHOW_HAVE}, + {sys_have_openssl.name, (char*) &have_ssl, SHOW_HAVE}, + {sys_have_ssl.name, (char*) &have_ssl, SHOW_HAVE}, {sys_have_partition_db.name,(char*) &have_partition_db, SHOW_HAVE}, {sys_have_query_cache.name, (char*) &have_query_cache, SHOW_HAVE}, {sys_have_rtree_keys.name, (char*) &have_rtree_keys, SHOW_HAVE}, |