diff options
| author | monty@mashka.mysql.fi <> | 2003-02-04 21:52:14 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-02-04 21:52:14 +0200 |
| commit | 023d6dd39b9068ab8096c5ec60ab82bd10dbcee2 (patch) | |
| tree | bad5f8dd7f020cc76a4c5e0f19bd130e3fb4a735 /include/my_base.h | |
| parent | 6a32ae735541b4780a209e883430ded343115792 (diff) | |
| parent | 5ce0cd16b8b9fa05c781ac6ff4687133ed145d84 (diff) | |
| download | mariadb-git-023d6dd39b9068ab8096c5ec60ab82bd10dbcee2.tar.gz | |
Merge with 4.0.11
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index b16a545b937..f167ae3d30e 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -217,6 +217,7 @@ enum ha_base_keytype { #define HA_ERR_CRASHED 126 /* Indexfile is crashed */ #define HA_ERR_WRONG_IN_RECORD 127 /* Record-file is crashed */ #define HA_ERR_OUT_OF_MEM 128 /* Record-file is crashed */ +#define HA_ERR_NOT_A_TABLE 130 /* not a MYI file - no signature */ #define HA_ERR_WRONG_COMMAND 131 /* Command not supported */ #define HA_ERR_OLD_FILE 132 /* old databasfile */ #define HA_ERR_NO_ACTIVE_RECORD 133 /* No record read in update() */ @@ -229,7 +230,7 @@ enum ha_base_keytype { #define HA_WRONG_CREATE_OPTION 140 /* Wrong create option */ #define HA_ERR_FOUND_DUPP_UNIQUE 141 /* Dupplicate unique on write */ #define HA_ERR_UNKNOWN_CHARSET 142 /* Can't open charset */ -#define HA_ERR_WRONG_TABLE_DEF 143 +#define HA_ERR_WRONG_MRG_TABLE_DEF 143 /* conflicting MyISAM tables in MERGE */ #define HA_ERR_CRASHED_ON_REPAIR 144 /* Last (automatic?) repair failed */ #define HA_ERR_CRASHED_ON_USAGE 145 /* Table must be repaired */ #define HA_ERR_LOCK_WAIT_TIMEOUT 146 |