diff options
| author | magnus@neptunus.(none) <> | 2004-09-14 10:03:56 +0200 |
|---|---|---|
| committer | magnus@neptunus.(none) <> | 2004-09-14 10:03:56 +0200 |
| commit | 619b8a0beb70e15f3a29ec1c3e9c4e93d7694d93 (patch) | |
| tree | b9a32ef993628ed3929a21dc4f4fa848ca620465 /include | |
| parent | 618ada6345a846b72777f1215b05cadd9a3f5c7b (diff) | |
| parent | d41f7af07ebdbda3acb81efdf31455fc76e6d44c (diff) | |
| download | mariadb-git-619b8a0beb70e15f3a29ec1c3e9c4e93d7694d93.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
Diffstat (limited to 'include')
| -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 0ef66ef8123..d884113dc4d 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -241,6 +241,7 @@ enum ha_base_keytype { #define HA_CREATE_TMP_TABLE 4 #define HA_CREATE_CHECKSUM 8 #define HA_CREATE_DELAY_KEY_WRITE 64 +#define HA_CREATE_FROM_ENGINE 128 /* Bits in flag to _status */ @@ -287,7 +288,7 @@ enum ha_base_keytype { #define HA_ERR_ROW_IS_REFERENCED 152 /* Cannot delete a parent row */ #define HA_ERR_NO_SAVEPOINT 153 /* No savepoint with that name */ #define HA_ERR_NON_UNIQUE_BLOCK_SIZE 154 /* Non unique key block size */ -#define HA_ERR_OLD_METADATA 155 /* The frm file on disk is old */ +#define HA_ERR_NO_SUCH_TABLE 155 /* The table does not exist in engine */ #define HA_ERR_TABLE_EXIST 156 /* The table existed in storage engine */ #define HA_ERR_NO_CONNECTION 157 /* Could not connect to storage engine */ |