diff options
| author | unknown <magnus@neptunus.(none)> | 2004-04-15 09:22:29 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-04-15 09:22:29 +0200 |
| commit | 90cf174529bbdf102890aed3e5f91c09d97b1c72 (patch) | |
| tree | 5e73e709e606833dc858dbf6173f5a6e1f3280c9 /include/my_base.h | |
| parent | 4cc26335c12a253e33d3e236966c2f0038710fa4 (diff) | |
| parent | 43dcf48e2f00c7cce50dfe30cc5593afac6a91c8 (diff) | |
| download | mariadb-git-90cf174529bbdf102890aed3e5f91c09d97b1c72.tar.gz | |
Merge conflicts with EXAMPLE handler
include/my_base.h:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h index 61d4c4e3225..54c739bde23 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -287,6 +287,9 @@ 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_TABLE_EXIST 156 /* The table existed in storage engine */ +#define HA_ERR_NO_CONNECTION 157 /* Could not connect to storage engine */ /* Other constants */ |