diff options
| author | unknown <magnus@neptunus.(none)> | 2004-09-30 16:12:28 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-09-30 16:12:28 +0200 |
| commit | f6f7af7a709db10a68367b34a0116be55315a8c8 (patch) | |
| tree | 7c3b171c96bcc638eae5de8175be3a8b8806e62b /include | |
| parent | 8bb1d2ae9b714482e54c664e4cb9e62dff870cb4 (diff) | |
| parent | b7c3591b326c3bc4376a84152e9acc6689bf686b (diff) | |
| download | mariadb-git-f6f7af7a709db10a68367b34a0116be55315a8c8.tar.gz | |
Merge fixes
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.cc:
Merge: ndb_discover_tables should no longer be called when server is starting
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 */ |