diff options
| author | unknown <ingo@mysql.com> | 2005-09-14 13:37:16 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-14 13:37:16 +0200 |
| commit | a1503923177ff2bebe64b3d4d3b40264ff6c4fd0 (patch) | |
| tree | ae2fd0258faa8a659833fd8a79ec66c3c11e5e83 /sql/structs.h | |
| parent | a3f87ca4c73e225e828487f2f22bdb24210aa83c (diff) | |
| parent | 5fe65297d21ed815d221699cad46e44958f74a06 (diff) | |
| download | mariadb-git-a1503923177ff2bebe64b3d4d3b40264ff6c4fd0.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
include/my_sys.h:
Auto merged
mysys/mf_keycache.c:
Auto merged
sql/sql_test.cc:
Auto merged
sql/mysqld.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/structs.h:
Manual 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 03176b47360..e490a2de60c 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -186,7 +186,7 @@ enum SHOW_TYPE SHOW_SSL_GET_CIPHER_LIST, #endif /* HAVE_OPENSSL */ SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS, - SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, + SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG, SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS }; |