diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-18 15:29:21 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-18 15:29:21 +0300 |
| commit | e3a9e7e40e63e8bed554cfbceacf29490df1a14a (patch) | |
| tree | 35de6d990347d36ed98c291f451de3d5c41dc151 /include | |
| parent | 12d4a5efe938688ef935818d22880137c95c2bfc (diff) | |
| download | mariadb-git-e3a9e7e40e63e8bed554cfbceacf29490df1a14a.tar.gz | |
New startup options and some cleanups
BitKeeper/etc/ignore:
Added =6 to the ignore list
include/mysqld_error.h:
Error message for no-mixing of table types..
sql/mysql_priv.h:
New option
sql/mysqld.cc:
New option
sql/share/english/errmsg.txt:
Error message for no-mixing of table types..
sql/sql_base.cc:
Checking of the mixing of table types
sql/sql_parse.cc:
some fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index ab37065b761..c921beafa4a 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -218,4 +218,5 @@ #define ER_WRONG_USAGE 1215 #define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1216 #define ER_CANT_UPDATE_WITH_READLOCK 1217 -#define ER_ERROR_MESSAGES 218 +#define ER_MIXING_NOT_ALLOWED 1218 +#define ER_ERROR_MESSAGES 219 |