diff options
| author | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
| commit | 08b3e79e409c79e09751ac8fd684898e390737d3 (patch) | |
| tree | 6fc367f3ae7c8968bf852d78cccec9f8c03ab417 /include | |
| parent | c5d4d50ab703d9b3cb087ea5e721baed6fbdab8c (diff) | |
| parent | 248e44945161ec6a84072c8684447aeb702e5bd7 (diff) | |
| download | mariadb-git-08b3e79e409c79e09751ac8fd684898e390737d3.tar.gz | |
Merge with global tree
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/examples/ha_archive.cc:
Merge with global tree
(Use my changes)
sql/sql_parse.cc:
Remove 'tmp' fix to be able to run tests
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysys_err.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/mysys_err.h b/include/mysys_err.h index 1e489395c76..341e6950792 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -26,10 +26,14 @@ extern "C" { extern const char * NEAR globerrs[]; /* my_error_messages is here */ /* Error message numbers in global map */ -/* Do not add error numbers before EE_ERROR_FIRST. */ -/* If necessary to add lower numbers, change EE_ERROR_FIRST accordingly. */ -#define EE_ERROR_FIRST 0 /*Copy first error nr.*/ -#define EE_FILENOTFOUND 0 +/* + Do not add error numbers before EE_ERROR_FIRST. + If necessary to add lower numbers, change EE_ERROR_FIRST accordingly. + + We start with error 1 to not confuse peoples with 'error 0' +*/ + +#define EE_ERROR_FIRST 1 /*Copy first error nr.*/ #define EE_CANTCREATEFILE 1 #define EE_READ 2 #define EE_WRITE 3 @@ -57,7 +61,8 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ #define EE_REALPATH 26 #define EE_SYNC 27 #define EE_UNKNOWN_COLLATION 28 -#define EE_ERROR_LAST 28 /*Copy last error nr.*/ +#define EE_FILENOTFOUND 29 +#define EE_ERROR_LAST 29 /*Copy last error nr.*/ /* Add error numbers before EE_ERROR_LAST and change it accordingly. */ /* exit codes for all MySQL programs */ |