diff options
| author | unknown <jimw@rama.(none)> | 2006-07-18 10:25:04 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-07-18 10:25:04 -0700 |
| commit | a00f18e5e6d956d9e69f999720620eeecab45e08 (patch) | |
| tree | 076fd3b798b96ac27bbf09594d537719b6473bbe /include | |
| parent | abbf7ad01461284d8c92fbc385caa4b37fa50765 (diff) | |
| parent | e52940aa7f4337173d9295eb9e42951713ac96c7 (diff) | |
| download | mariadb-git-a00f18e5e6d956d9e69f999720620eeecab45e08.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-engines
into rama.(none):/home/jimw/my/mysql-5.0-17608
include/my_base.h:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
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 05ba38e77eb..d8a0e15ccbe 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -356,8 +356,9 @@ enum ha_base_keytype { #define HA_ERR_NULL_IN_SPATIAL 158 /* NULLs are not supported in spatial index */ #define HA_ERR_TABLE_DEF_CHANGED 159 /* The table changed in storage engine */ #define HA_ERR_TABLE_NEEDS_UPGRADE 160 /* The table changed in storage engine */ +#define HA_ERR_TABLE_READONLY 161 /* The table is not writable */ -#define HA_ERR_LAST 160 /*Copy last error nr.*/ +#define HA_ERR_LAST 161 /*Copy last error nr.*/ /* Add error numbers before HA_ERR_LAST and change it accordingly. */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |