diff options
| author | unknown <sergefp@mysql.com> | 2004-05-24 21:13:38 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-24 21:13:38 +0400 |
| commit | c54f3ba680f6a1fe74e937dfe7b14da04220cba3 (patch) | |
| tree | 5d63ab734c1fdc0e1db222f30ea63c47fae38c8c /sql/sql_class.h | |
| parent | fbfdcf22f49eacc4a90fb6169dbbecb36d8e8b68 (diff) | |
| parent | 88da3ae5f9e69a3bf6ced379908d01da5b3bfbb0 (diff) | |
| download | mariadb-git-c54f3ba680f6a1fe74e937dfe7b14da04220cba3.tar.gz | |
Merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_lex.h:
SCCS merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index e44c06fda6e..96043efb3a3 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -28,7 +28,7 @@ class Load_log_event; class Slave_log_event; enum enum_enable_or_disable { LEAVE_AS_IS, ENABLE, DISABLE }; -enum enum_ha_read_modes { RFIRST, RNEXT, RPREV, RLAST, RKEY }; +enum enum_ha_read_modes { RFIRST, RNEXT, RPREV, RLAST, RKEY, RNEXT_SAME }; enum enum_duplicates { DUP_ERROR, DUP_REPLACE, DUP_IGNORE, DUP_UPDATE }; enum enum_log_type { LOG_CLOSED, LOG_TO_BE_OPENED, LOG_NORMAL, LOG_NEW, LOG_BIN}; enum enum_delay_key_write { DELAY_KEY_WRITE_NONE, DELAY_KEY_WRITE_ON, |