diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-11-18 17:28:00 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-11-18 17:28:00 +0200 |
| commit | c05413175bbbe2ec715d28c5cd28542ceba3d7e2 (patch) | |
| tree | b2829b6021df3f4b18bf81039b7bc065f4edb5b7 /include | |
| parent | 6b671182125b2e3aa19cc65f0ecf1fbb5df194ad (diff) | |
| download | mariadb-git-c05413175bbbe2ec715d28c5cd28542ceba3d7e2.tar.gz | |
Delete duplicate error message names
include/mysqld_error.h:
Delete duplicate error names
include/sql_state.h:
Delete duplicate error names
myisam/ft_dump.c:
Delete wrong patch
myisam/myisamchk.c:
Delete wrong patch
mysql-test/r/query_cache.result:
Fix after deleting duplicated error messages
mysql-test/t/create.test:
Fix after deleting duplicated error messages
mysql-test/t/fulltext.test:
Fix after deleting duplicated error messages
mysql-test/t/key_cache.test:
Fix after deleting duplicated error messages
sql/share/czech/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/danish/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/dutch/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/english/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/estonian/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/french/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/german/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/greek/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/hungarian/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/italian/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/japanese/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/korean/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/norwegian-ny/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/norwegian/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/polish/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/portuguese/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/romanian/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/russian/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/serbian/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/slovak/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/spanish/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/swedish/errmsg.txt:
Fix after deleting duplicated error messages
sql/share/ukrainian/errmsg.txt:
Fix after deleting duplicated error messages
sql/sql_db.cc:
Fix after deleting duplicated error messages
sql/sql_parse.cc:
Fix after deleting duplicated error messages
sql/sql_table.cc:
Fix after deleting duplicated error messages
tests/client_test.c:
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 15 | ||||
| -rw-r--r-- | include/sql_state.h | 3 |
2 files changed, 6 insertions, 12 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 79f089ed6c8..a6e23fbff3a 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -295,12 +295,9 @@ #define ER_BAD_SLAVE_UNTIL_COND 1276 #define ER_MISSING_SKIP_SLAVE 1277 #define ER_UNTIL_COND_IGNORED 1278 -#define ER_WRONG_NAME_FOR_TABLE 1279 -#define ER_WRONG_NAME_FOR_DATABASE 1280 -#define ER_WRONG_NAME_FOR_COLUMN 1281 -#define ER_WRONG_NAME_FOR_INDEX 1282 -#define ER_WRONG_NAME_FOR_CATALOG 1283 -#define ER_WARN_QC_RESIZE 1284 -#define ER_BAD_FT_COLUMN 1285 -#define ER_UNKNOWN_KEY_CACHE 1286 -#define ER_ERROR_MESSAGES 287 +#define ER_WRONG_NAME_FOR_INDEX 1279 +#define ER_WRONG_NAME_FOR_CATALOG 1280 +#define ER_WARN_QC_RESIZE 1281 +#define ER_BAD_FT_COLUMN 1282 +#define ER_UNKNOWN_KEY_CACHE 1283 +#define ER_ERROR_MESSAGES 284 diff --git a/include/sql_state.h b/include/sql_state.h index 31646ea7b6b..a514b1e59fc 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -159,8 +159,5 @@ ER_WARN_TOO_MANY_RECORDS, "01000", "", ER_WARN_NULL_TO_NOTNULL, "01000", "", ER_WARN_DATA_OUT_OF_RANGE, "01000", "", ER_WARN_DATA_TRUNCATED, "01000", "", -ER_WRONG_NAME_FOR_TABLE, "42000", "", -ER_WRONG_NAME_FOR_DATABASE, "42000", "", -ER_WRONG_NAME_FOR_COLUMN, "42000", "", ER_WRONG_NAME_FOR_INDEX, "42000", "", ER_WRONG_NAME_FOR_CATALOG, "42000", "", |