diff options
| author | msvensson@neptunus.(none) <> | 2005-10-28 11:00:54 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-10-28 11:00:54 +0200 |
| commit | be6f7a3f82e6df044de4f50a61d9cfbd9ac5ea9b (patch) | |
| tree | cab20fd69d3450e59c240fdca1a7305d4dd1c98e /sql/mysqld.cc | |
| parent | 74b8b449a4d70858758994114b9b559f3275e005 (diff) | |
| parent | 22c0d6489c141ff367e73d8be693610e83d28c14 (diff) | |
| download | mariadb-git-be6f7a3f82e6df044de4f50a61d9cfbd9ac5ea9b.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b7d36cc7788..143ed74e012 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2860,7 +2860,14 @@ static void init_ssl() opt_ssl_cipher); DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); if (!ssl_acceptor_fd) + { opt_use_ssl = 0; + have_openssl= SHOW_OPTION_DISABLED; + } + } + else + { + have_openssl= SHOW_OPTION_DISABLED; } if (des_key_file) load_des_key_file(des_key_file); @@ -5952,6 +5959,7 @@ struct show_var_st status_vars[]= { {"Com_xa_recover", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_XA_RECOVER]),SHOW_LONG_STATUS}, {"Com_xa_rollback", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_XA_ROLLBACK]),SHOW_LONG_STATUS}, {"Com_xa_start", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_XA_START]),SHOW_LONG_STATUS}, + {"Compression", (char*) 0, SHOW_NET_COMPRESSION}, {"Connections", (char*) &thread_id, SHOW_LONG_CONST}, {"Created_tmp_disk_tables", (char*) offsetof(STATUS_VAR, created_tmp_disk_tables), SHOW_LONG_STATUS}, {"Created_tmp_files", (char*) &my_tmp_file_created, SHOW_LONG}, |