summaryrefslogtreecommitdiff
path: root/include/mysqld_error.h
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2004-02-28 23:36:41 +0100
committerguilhem@mysql.com <>2004-02-28 23:36:41 +0100
commit5137821ceaa1ad16789bee5489f54275c4261a32 (patch)
tree372e0ba803d0387040691a324ea57032f0ca2b75 /include/mysqld_error.h
parent6ebedbb6e35b752d8947bc3763fffb2a8b0615a3 (diff)
downloadmariadb-git-5137821ceaa1ad16789bee5489f54275c4261a32.tar.gz
small after-merge fixes (error messages).
Diffstat (limited to 'include/mysqld_error.h')
-rw-r--r--include/mysqld_error.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 494f19aa7bd..e95a35bdc51 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -306,5 +306,5 @@
#define ER_WARN_DEPRECATED_SYNTAX 1287
#define ER_NON_UPDATABLE_TABLE 1288
#define ER_FEATURE_DISABLED 1289
-#define ER_SKIP_GRANT_TABLES 1290
+#define ER_OPTION_PREVENTS_STATEMENT 1290
#define ER_ERROR_MESSAGES 291