diff options
| author | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
| commit | 684f13ef4c20cc1843c615ee17a8013f65617442 (patch) | |
| tree | 254bb1b067e503a819145fff488d83709bf9c798 /sql/structs.h | |
| parent | d7ad2cbe5b55d422affe8d180d0cc8dab1c518e1 (diff) | |
| parent | 56129ce634088b51dd60381711519c9125e8df72 (diff) | |
| download | mariadb-git-684f13ef4c20cc1843c615ee17a8013f65617442.tar.gz | |
Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push
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 9272e1f28e0..e0f32ebbe43 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -140,7 +140,7 @@ enum SHOW_TYPE { SHOW_LONG,SHOW_CHAR,SHOW_INT,SHOW_CHAR_PTR,SHOW_BOOL, ,SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL ,SHOW_SSL_GET_CIPHER_LIST #endif /* HAVE_OPENSSL */ - ,SHOW_RPL_STATUS + ,SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING }; enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED}; |