summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-10-04 15:43:55 +0200
committermsvensson@neptunus.(none) <>2005-10-04 15:43:55 +0200
commitcb96f195c8ec86236b1673adc0db5d32e08bd957 (patch)
tree26f143bdced58d5853d938349663652aaa3fcc4d /sql/sql_show.cc
parent7de902fcefc0359bde4492b1ff804aefc5c9628b (diff)
downloadmariadb-git-cb96f195c8ec86236b1673adc0db5d32e08bd957.tar.gz
Improved testing of ssl and compression
- Added show status variable "compression" for checking that compression is turned on. - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections. - Setup server to accept ssl connections from clients ig that is supported by server - New tests - ssl - Run with ssl turned on - ssl_compress - Run with ssl and compression turned on - compress - Run with compression turned in - Updated test - openssl_1, rpl_openssl1 - Changed to run if server supports ssl
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 929bf36d305..4b3242cbe12 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1632,6 +1632,11 @@ static bool show_status_array(THD *thd, const char *wild,
value= (value-(char*) &dflt_key_cache_var)+ (char*) dflt_key_cache;
end= longlong10_to_str(*(longlong*) value, buff, 10);
break;
+#ifdef HAVE_COMPRESS
+ case SHOW_NET_COMPRESSION:
+ end= strmov(buff, thd->net.compress ? "ON" : "OFF");
+ break;
+#endif /* HAVE_COMPRESS */
case SHOW_UNDEF: // Show never happen
case SHOW_SYS:
break; // Return empty string