diff options
| author | unknown <monty@nosik.monty.fi> | 2006-11-27 01:51:50 +0200 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2006-11-27 01:51:50 +0200 |
| commit | f700408717ea7d51132c150a9afaddcb73071b49 (patch) | |
| tree | 49d6dd88d75f1d6a0d8e481cb8ae015f6f2b91f6 /include/errmsg.h | |
| parent | 788ad30f081bc55ff97ceed78ec7ff545e25ed99 (diff) | |
| parent | 52fc261bcab0becc9d23f8d1e511760413a6d85d (diff) | |
| download | mariadb-git-f700408717ea7d51132c150a9afaddcb73071b49.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
client/mysqldump.c:
Auto merged
include/errmsg.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql-common/client.c:
Auto merged
mysql-test/mysql-test-run-shell.sh:
SCCS 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. */ |