summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2006-05-30 00:08:58 -0700
committerigor@rurik.mysql.com <>2006-05-30 00:08:58 -0700
commit6051e0f959d9767444ddc5fd98fa8487bf45153b (patch)
treef9421c44e8d3ae5a70614712d873ee3f94c7c244 /include
parentcb4c6a0dede7873aa151042b5f0aff9f545a5a89 (diff)
downloadmariadb-git-6051e0f959d9767444ddc5fd98fa8487bf45153b.tar.gz
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h2
-rw-r--r--include/sql_state.h1
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", "",