diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-03 16:09:36 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-03 16:09:36 -0600 |
| commit | 8d89555e4602d817b6ebc449635cca47e3380b90 (patch) | |
| tree | 97ccb13c4b0a44d464a0cca69c725323df8422b9 /include | |
| parent | 0dab9f40e1c52ac00e1ca291785ae7943dea577e (diff) | |
| parent | a8f2c247ec2a915985596ef74a3804f624cdd5d3 (diff) | |
| download | mariadb-git-8d89555e4602d817b6ebc449635cca47e3380b90.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index b858ae89ef1..52f4261c22b 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -210,7 +210,10 @@ #define ER_READ_ONLY_TRANSACTION 1207 #define ER_DROP_DB_WITH_READ_LOCK 1208 #define ER_CREATE_DB_WITH_READ_LOCK 1209 -#define ER_CONNECT_TO_MASTER 1210 -#define ER_QUERY_ON_MASTER 1211 -#define ER_ERROR_WHEN_EXECUTING_COMMAND 1212 -#define ER_ERROR_MESSAGES 213 +#define ER_WRONG_ARGUMENTS 1210 +#define ER_CONNECT_TO_MASTER 1211 +#define ER_QUERY_ON_MASTER 1212 +#define ER_ERROR_WHEN_EXECUTING_COMMAND 1213 +#define ER_WRONG_USAGE 1214 +#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215 +#define ER_ERROR_MESSAGES 216 |