diff options
| author | msvensson@pilot.blaudden <> | 2007-03-05 11:50:59 +0100 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-03-05 11:50:59 +0100 |
| commit | a30867bc6548fab603d6927689a22f08da6db97e (patch) | |
| tree | d31a7cec9d01200f96d547018c632b26c1c69f21 /sql/set_var.cc | |
| parent | be1e948543231fe70e5d62bfa35aa4e52ff558e1 (diff) | |
| parent | b271a3364dbe3a09ef6e3deb9985644319d8538d (diff) | |
| download | mariadb-git-a30867bc6548fab603d6927689a22f08da6db97e.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index daccd0469e7..46c2a775d8a 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -871,7 +871,9 @@ struct show_var_st init_vars[]= { {"have_isam", (char*) &have_isam, SHOW_HAVE}, {"have_merge_engine", (char*) &have_merge_db, SHOW_HAVE}, {"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE}, - {"have_openssl", (char*) &have_openssl, SHOW_HAVE}, + /* have_openssl is just and alias for have_ssl */ + {"have_openssl", (char*) &have_ssl, SHOW_HAVE}, + {"have_ssl", (char*) &have_ssl, SHOW_HAVE}, {"have_query_cache", (char*) &have_query_cache, SHOW_HAVE}, {"have_raid", (char*) &have_raid, SHOW_HAVE}, {"have_rtree_keys", (char*) &have_rtree_keys, SHOW_HAVE}, |