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/structs.h | |
| 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/structs.h')
| -rw-r--r-- | sql/structs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/structs.h b/sql/structs.h index 21aaf584925..3c651c491d3 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -185,6 +185,7 @@ enum SHOW_TYPE SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL, SHOW_SSL_GET_CIPHER_LIST, #endif /* HAVE_OPENSSL */ + SHOW_NET_COMPRESSION, SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG, SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS |