diff options
| author | unknown <igor@rurik.mysql.com> | 2006-05-30 00:08:58 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-05-30 00:08:58 -0700 |
| commit | a2993441ab9079c634cfd62ddef2a8526114acb5 (patch) | |
| tree | f9421c44e8d3ae5a70614712d873ee3f94c7c244 /include | |
| parent | b29e052dbfe5021fefb5d312860a4980c851c24b (diff) | |
| download | mariadb-git-a2993441ab9079c634cfd62ddef2a8526114acb5.tar.gz | |
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
mysql-test/r/select.result:
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
Added a new test case.
mysql-test/t/select.test:
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
Added a new test case.
sql/share/czech/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/danish/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/dutch/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/english/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/estonian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/french/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/german/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/greek/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.\
sql/share/hungarian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/italian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/japanese-sjis/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.\
sql/share/japanese/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/korean/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/norwegian-ny/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/norwegian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/polish/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/portuguese/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/romanian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/russian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/serbian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/slovak/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/spanish/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/swedish/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/ukrainian/errmsg.txt:
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 2 | ||||
| -rw-r--r-- | include/sql_state.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 726779c45c5..0d1d2eccba8 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -319,5 +319,5 @@ #define ER_INVALID_CHARACTER_STRING 1300 #define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301 #define ER_CONFLICTING_DECLARATIONS 1302 -#define ER_INDEX_DOES_NOT_EXIST 1303 +/* Attention: 1302 must be the last error code in 4.1 */ #define ER_ERROR_MESSAGES 303 diff --git a/include/sql_state.h b/include/sql_state.h index 079349eb3cb..52a359405e1 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -162,4 +162,3 @@ ER_WARN_DATA_TRUNCATED, "01000", "", ER_WRONG_NAME_FOR_INDEX, "42000", "", ER_WRONG_NAME_FOR_CATALOG, "42000", "", ER_UNKNOWN_STORAGE_ENGINE, "42000", "", -ER_INDEX_DOES_NOT_EXIST, "42000", "", |