diff options
| author | unknown <jimw@rama.(none)> | 2006-07-11 17:28:50 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-07-11 17:28:50 -0700 |
| commit | 97cdd9df8a67a26335fba3ffbb9daca7b2877b10 (patch) | |
| tree | c614126b30086c98bceee3d353c579a693288480 /include | |
| parent | c3cb46908c30895e0aafa0f7602370240a3c5a98 (diff) | |
| download | mariadb-git-97cdd9df8a67a26335fba3ffbb9daca7b2877b10.tar.gz | |
Bug #17766: The server accepts to create MERGE tables which cannot work
Changed the error reporting (and a crash) when inserting data into a
MERGE table that has no underlying tables or no INSERT_METHOD specified
by reporting that it is read-only.
include/my_base.h:
Add new handler error
mysql-test/r/merge.result:
Update results
mysql-test/t/merge.test:
Add new regression test
sql/ha_myisammrg.cc:
When trying to insert into a MERGE table with no underlying tables
or no INSERT_METHOD, report that it is read-only.
sql/handler.cc:
Handle new error message
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 076eed9998f..e5744fd1621 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -347,8 +347,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) |