diff options
| author | unknown <monty@mysql.com> | 2004-07-09 02:29:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-09 02:29:28 +0300 |
| commit | 53ca595451d53fccd60b1112c444e5278021c1ee (patch) | |
| tree | d39c3dfa90aad2f93012b09513ff0ba42c1aa0cb /include/my_getopt.h | |
| parent | 661b8165eced19f1943aeee1b166ff10191ab037 (diff) | |
| parent | ee9890162e2a2b44f8b09c14b0a22ba9d086df95 (diff) | |
| download | mariadb-git-53ca595451d53fccd60b1112c444e5278021c1ee.tar.gz | |
Merge with 4.0 to get bug fixes
Build-tools/Bootstrap:
Auto merged
Build-tools/Do-compile:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/r/system_mysql_db_refs.result:
Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
Auto merged
mysql-test/t/system_mysql_db.test:
Auto merged
Diffstat (limited to 'include/my_getopt.h')
| -rw-r--r-- | include/my_getopt.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h index 5f4025efa0e..bf119892a31 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -16,10 +16,17 @@ C_MODE_START -enum get_opt_var_type { GET_NO_ARG, GET_BOOL, GET_INT, GET_UINT, GET_LONG, - GET_ULONG, GET_LL, GET_ULL, GET_STR, GET_STR_ALLOC, - GET_DISABLED - }; +#define GET_NO_ARG 1 +#define GET_BOOL 2 +#define GET_INT 3 +#define GET_UINT 4 +#define GET_LONG 5 +#define GET_ULONG 6 +#define GET_LL 7 +#define GET_ULL 8 +#define GET_STR 9 +#define GET_STR_ALLOC 10 +#define GET_DISABLED 11 #define GET_ASK_ADDR 128 #define GET_TYPE_MASK 127 @@ -34,7 +41,7 @@ struct my_option gptr *value; /* The variable value */ gptr *u_max_value; /* The user def. max variable value */ const char **str_values; /* Pointer to possible values */ - enum get_opt_var_type var_type; + ulong var_type; enum get_opt_arg_type arg_type; longlong def_value; /* Default value */ longlong min_value; /* Min allowed value */ |