diff options
| author | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
| commit | 67ea8aac5e9e9ae98a22aff063c48053ea68e5de (patch) | |
| tree | 788ab6bf4fc7ac236c7c862ab122f19dcdd83768 /include/errmsg.h | |
| parent | d212d76094f83b1b7ce0692663439f3a67a432ad (diff) | |
| parent | 6b465557670093b038cb3d2be930e6a036292192 (diff) | |
| download | mariadb-git-67ea8aac5e9e9ae98a22aff063c48053ea68e5de.tar.gz | |
merge with 4.0 (to get compiler error fixes for innodb)
client/mysqltest.c:
Auto merged
include/errmsg.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/que/que0que.c:
Auto merged
mysql-test/t/rpl000009.test:
Auto merged
sql/set_var.cc:
Auto merged
libmysql/errmsg.c:
merge with 4.0
libmysql/libmysql.c:
merge with 4.0
mysql-test/mysql-test-run.sh:
merge with 4.0
mysql-test/r/rpl000009.result:
merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
merge with 4.0
sql/repl_failsafe.cc:
merge with 4.0
Diffstat (limited to 'include/errmsg.h')
| -rw-r--r-- | include/errmsg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 16f220a7ee2..76a293f3dec 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -63,6 +63,7 @@ extern const char *client_errors[]; /* Error messages */ #define CR_PROBE_MASTER_CONNECT 2025 #define CR_SSL_CONNECTION_ERROR 2026 #define CR_MALFORMED_PACKET 2027 +#define CR_WRONG_LICENSE 2028 /* new 4.1 error codes */ #define CR_NULL_POINTER 2028 |