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/sql_show.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/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e53b7c24833..5a27e20d3c5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1642,6 +1642,9 @@ 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; + case SHOW_NET_COMPRESSION: + end= strmov(buff, thd->net.compress ? "ON" : "OFF"); + break; case SHOW_UNDEF: // Show never happen case SHOW_SYS: break; // Return empty string |