diff options
| author | unknown <hf@deer.(none)> | 2004-07-21 19:10:37 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-07-21 19:10:37 +0500 |
| commit | c5fc0d433ab28d4309297875092888c920dcde3f (patch) | |
| tree | e760e781ebd9feba1f0e8c01f34971bd6e703d70 /include/mysqld_error.h | |
| parent | bf95f9195fe431841fe1e29e6b82c9f47ec52ad3 (diff) | |
| parent | 58bdba5785313f89398231f796ba989a4de81a69 (diff) | |
| download | mariadb-git-c5fc0d433ab28d4309297875092888c920dcde3f.tar.gz | |
Merging
mysql-test/r/func_str.result:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 3 |
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 |