diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-12 13:59:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-12 13:59:00 +0200 |
| commit | efc190e7d9e4f17ec320f56a0b8f851d1c67103a (patch) | |
| tree | 245edcdee31566feb6e5f8cd9862d12c84484293 /sql/mysqld.cc | |
| parent | 14b89a32019fc5e0a61ba53fdb8f0891f13cf4db (diff) | |
| parent | 2bb0501d655bfc072dfc7a80e337904cd7865073 (diff) | |
| download | mariadb-git-efc190e7d9e4f17ec320f56a0b8f851d1c67103a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/mysqltest.result:
SCCS merged
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 5befcd6d503..f532b443a5f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2868,7 +2868,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); @@ -5959,6 +5966,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}, |