diff options
| author | unknown <mskold@mysql.com> | 2005-02-26 16:15:36 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-26 16:15:36 +0100 |
| commit | 092936d616e078eeed0d8873477fd3d8fc405fb1 (patch) | |
| tree | f808846a5ff849df7616e3c21076d6367cf010b9 /include | |
| parent | 269b45969ac678e67c742196d6970092a8d87f78 (diff) | |
| parent | a4220ddc5f1f84af01e61f22770b01838044180b (diff) | |
| download | mariadb-git-092936d616e078eeed0d8873477fd3d8fc405fb1.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 */ |