diff options
author | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
commit | 49e3024c1a1e950e0fe9fecbccfd13c9728a5b82 (patch) | |
tree | 2e5fd2ea8d04d6274f3da86ac5b02bed3f38bb8a /include/errmsg.h | |
parent | cadef27521616ba6caea1556ae053a09e3bde6d8 (diff) | |
parent | 4b13e338241778aefad46fde158a4cb99db083e1 (diff) | |
download | mariadb-git-49e3024c1a1e950e0fe9fecbccfd13c9728a5b82.tar.gz |
Merge 192.168.0.5:mysql/mysql-5.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include/errmsg.h')
-rw-r--r-- | include/errmsg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index dc7adb3b501..f24ea2bf396 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -95,6 +95,7 @@ extern const char *client_errors[]; /* Error messages */ #define CR_NO_STMT_METADATA 2052 #define CR_NO_RESULT_SET 2053 #define CR_NOT_IMPLEMENTED 2054 -#define CR_ERROR_LAST /*Copy last error nr:*/ 2054 +#define CR_SERVER_LOST_EXTENDED 2055 +#define CR_ERROR_LAST /*Copy last error nr:*/ 2055 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */ |