diff options
| author | unknown <gbichot@quadita2.mysql.com> | 2005-03-24 14:32:40 +0100 |
|---|---|---|
| committer | unknown <gbichot@quadita2.mysql.com> | 2005-03-24 14:32:40 +0100 |
| commit | 76b387ecb8785d950d2bf8856321e9fb54551bb7 (patch) | |
| tree | 1c70ef9270a90b0bd16be031467493ef431cad61 /sql/structs.h | |
| parent | a55543a4e0e805624f9da17cc6f167d5cd7c2f73 (diff) | |
| parent | e289fa2e702e842fff55c3431d1450d8d7768ce7 (diff) | |
| download | mariadb-git-76b387ecb8785d950d2bf8856321e9fb54551bb7.tar.gz | |
merge from 4.1
BitKeeper/etc/logging_ok:
auto-union
libmysql/Makefile.shared:
Auto merged
mysql-test/r/rpl_deadlock.result:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/structs.h:
Auto merged
sql/slave.cc:
merge
sql/slave.h:
merge
sql/sql_show.cc:
merge
Diffstat (limited to 'sql/structs.h')
| -rw-r--r-- | sql/structs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/structs.h b/sql/structs.h index cbc7161ee20..7a70bfc0f4f 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -182,7 +182,7 @@ enum SHOW_TYPE SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL, SHOW_SSL_GET_CIPHER_LIST, #endif /* HAVE_OPENSSL */ - SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, + SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS }; |