diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-07 20:17:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-07 20:17:37 +0200 |
| commit | f9d6463fdf09215fee71530693190abeedbbea66 (patch) | |
| tree | b9fd8ac3554fbea0abccf16d285c567223ca7050 /include/my_base.h | |
| parent | e73f1239dcffb56b35a7047b0f2ac43c39939ebc (diff) | |
| download | mariadb-git-f9d6463fdf09215fee71530693190abeedbbea66.tar.gz | |
BUG#6762 ALTER TABLE gives weird results and error message
- Removed hardcoded error message from 4.1
include/my_base.h:
Adding error message for the case when table definition has changed in storage engine
mysql-test/t/ndb_alter_table.test:
Updated testresult to expect new error code
sql/ha_ndbcluster.cc:
Add mapping for ndb error 284 to HA_ERR_TABLE_DEF_CHANGED, this error will occur when the table definition has been changed by another MySQL Server connected to the cluster.
Remove hardcoded errormessage from 4.1
sql/handler.cc:
Adding error message for the case when table definition has changed in storage engine
sql/share/errmsg.txt:
Adding error message for the case when table definition has changed in storage engine
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index 1713a07f6ec..25fa683744e 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -312,7 +312,9 @@ enum ha_base_keytype { #define HA_ERR_TABLE_EXIST 156 /* The table existed in storage engine */ #define HA_ERR_NO_CONNECTION 157 /* Could not connect to storage engine */ #define HA_ERR_NULL_IN_SPATIAL 158 /* NULLs are not supported in spatial index */ -#define HA_ERR_LAST 158 /*Copy last error nr.*/ +#define HA_ERR_TABLE_DEF_CHANGED 159 /* The table changed in storage engine */ + +#define HA_ERR_LAST 159 /*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) |