diff options
| author | unknown <wax@kishkin.ru> | 2003-04-02 18:15:16 +0600 |
|---|---|---|
| committer | unknown <wax@kishkin.ru> | 2003-04-02 18:15:16 +0600 |
| commit | aee0d02abdae17a6c24dd2aa0fe9a82bafc78fd8 (patch) | |
| tree | 488579564c80c09c40acdafd8ff903c433ef47c1 /include | |
| parent | 69b8b99a399da7ff0a6da857fbbb484a09a404fc (diff) | |
| parent | 6feda00ddb0253dc38f3b8fdf3e0a149086daf15 (diff) | |
| download | mariadb-git-aee0d02abdae17a6c24dd2aa0fe9a82bafc78fd8.tar.gz | |
Auto merged
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 2f4158110cd..d1453c86f2a 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -266,8 +266,5 @@ #define ER_SELECT_REDUCED 1247 #define ER_TABLENAME_NOT_ALLOWED_HERE 1248 #define ER_NOT_SUPPORTED_AUTH_MODE 1249 -#define ER_SPATIAL_CANT_HAVE_NULL 1250 -#define ER_COLLATION_CHARSET_MISMATCH 1251 -#define ER_SLAVE_WAS_RUNNING 1252 -#define ER_SLAVE_WAS_NOT_RUNNING 1253 -#define ER_ERROR_MESSAGES 254 +#define ER_CUT_VALUE_GROUP_CONCAT 1250 +#define ER_ERROR_MESSAGES 251 |