summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-12-30 13:16:49 +0200
committermonty@mysql.com <>2003-12-30 13:16:49 +0200
commit2ea2d1574978552b832a4edee36c37be216e7c9e (patch)
tree68178a5180429525e68155fcadd4072e95759e17 /include
parentc1dd070ba73952d0c18c8ca01a9cbf322fcab26e (diff)
parentac3ddc8d6c715362728adb197e7f332f67f3bfc9 (diff)
downloadmariadb-git-2ea2d1574978552b832a4edee36c37be216e7c9e.tar.gz
Merge
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 9d3197c0bd4..acc9b5961c6 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -254,4 +254,5 @@
#define ER_NOT_SUPPORTED_YET 1235
#define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236
#define ER_SLAVE_IGNORED_TABLE 1237 /* only the slave SQL thread can be sent this */
-#define ER_ERROR_MESSAGES 238
+#define ER_INCORRECT_GLOBAL_LOCAL_VAR 1238
+#define ER_ERROR_MESSAGES 239