diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-12-18 16:23:15 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-12-18 16:23:15 +0200 |
| commit | 765caec21ab2093869b3004562582f3357b7f0c4 (patch) | |
| tree | 06750a708d341a95ddae13a126cd65cf86965249 /include/my_base.h | |
| parent | fcc1cc8ab510f67838ac9fd1009ec95396bc8c7a (diff) | |
| parent | 630169c6d896bd33b65866d91f2bd8894b79bfa1 (diff) | |
| download | mariadb-git-765caec21ab2093869b3004562582f3357b7f0c4.tar.gz | |
Merge jani@marvel:/my/bk/mysql-maria.new
into hynda.mysql.fi:/home/my/mysql-maria
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/binlog_unsafe.result:
Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Auto merged
mysys/my_write.c:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
include/my_base.h:
Manual merge. New error code.
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index 553dcfe2232..fdf8d248879 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -304,8 +304,10 @@ enum ha_base_keytype { #define HA_OPTION_RELIES_ON_SQL_LAYER 512 #define HA_OPTION_NULL_FIELDS 1024 #define HA_OPTION_PAGE_CHECKSUM 2048 -#define HA_OPTION_TEMP_COMPRESS_RECORD ((uint) 16384) /* set by isamchk */ -#define HA_OPTION_READ_ONLY_DATA ((uint) 32768) /* Set by isamchk */ +#define HA_OPTION_TEMP_COMPRESS_RECORD (1L << 15) /* set by isamchk */ +#define HA_OPTION_READ_ONLY_DATA (1L << 16) /* Set by isamchk */ +#define HA_OPTION_NO_CHECKSUM (1L << 17) +#define HA_OPTION_NO_DELAY_KEY_WRITE (1L << 18) /* Bits in flag to create() */ @@ -372,6 +374,7 @@ enum ha_base_keytype { #define HA_ERR_KEY_NOT_FOUND 120 /* Didn't find key on read or update */ #define HA_ERR_FOUND_DUPP_KEY 121 /* Dupplicate key on write */ +#define HA_ERR_INTERNAL_ERROR 122 /* Internal error */ #define HA_ERR_RECORD_CHANGED 123 /* Uppdate with is recoverable */ #define HA_ERR_WRONG_INDEX 124 /* Wrong index given to function */ #define HA_ERR_CRASHED 126 /* Indexfile is crashed */ @@ -433,7 +436,8 @@ enum ha_base_keytype { #define HA_ERR_NEW_FILE 172 /* New file format */ #define HA_ERR_INITIALIZATION 173 /* Error during initialization */ #define HA_ERR_FILE_TOO_SHORT 174 /* File too short */ -#define HA_ERR_LAST 174 /* Copy of last error nr */ +#define HA_ERR_WRONG_CRC 175 /* Wrong CRC on page */ +#define HA_ERR_LAST 175 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |