diff options
author | unknown <monty@mysql.com> | 2004-01-20 00:15:01 +0100 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-01-20 00:15:01 +0100 |
commit | e44a7da25f4bc5e2be0303b527eb60a323178a68 (patch) | |
tree | d20bcd6bae79e9d29ece05ef1bb92e9041747f39 /include/mysys_err.h | |
parent | 43abc597b8854c44465a8a936febe780f223628c (diff) | |
parent | b89abbf8a154376678a3ed8a9fe6ea25b5209aba (diff) | |
download | mariadb-git-e44a7da25f4bc5e2be0303b527eb60a323178a68.tar.gz |
merge
myisam/mi_write.c:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include/mysys_err.h')
-rw-r--r-- | include/mysys_err.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysys_err.h b/include/mysys_err.h index 0ee89e91ee4..230be5f4720 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -68,6 +68,7 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ #define EXIT_UNKNOWN_SUFFIX 9 #define EXIT_NO_PTR_TO_VARIABLE 10 #define EXIT_CANNOT_CONNECT_TO_SERVICE 11 +#define EXIT_OPTION_DISABLED 12 #ifdef __cplusplus |