summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorhf@deer.(none) <>2004-07-21 19:10:37 +0500
committerhf@deer.(none) <>2004-07-21 19:10:37 +0500
commit5bff13bc72903705f2c3a8a42bc30fc283a6e2e1 (patch)
treee760e781ebd9feba1f0e8c01f34971bd6e703d70 /include
parent84d9b862f6619c74de00349e9398f11ec6409d10 (diff)
parenteb67909bf4a280c14267940d27172f7671aa2716 (diff)
downloadmariadb-git-5bff13bc72903705f2c3a8a42bc30fc283a6e2e1.tar.gz
Merging
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 0d752b0daf1..4d65515d6ce 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -317,4 +317,5 @@
#define ER_UNKNOWN_TIME_ZONE 1298
#define ER_WARN_INVALID_TIMESTAMP 1299
#define ER_INVALID_CHARACTER_STRING 1300
-#define ER_ERROR_MESSAGES 301
+#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301
+#define ER_ERROR_MESSAGES 302