diff options
| author | unknown <monty@mysql.com> | 2004-07-12 08:20:24 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-12 08:20:24 +0300 |
| commit | 677d60bc61a36be16af964eaae47cc88b0ecc33f (patch) | |
| tree | 4b4523bbabccb4e51b85fc209e3274f249f85ef8 /include/my_getopt.h | |
| parent | c4645f84047585b12523d8d111044bf040880bb4 (diff) | |
| parent | 18d974a3e7b48eec96c8837d42ebbc698e68ca55 (diff) | |
| download | mariadb-git-677d60bc61a36be16af964eaae47cc88b0ecc33f.tar.gz | |
Merge with 4.1
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/opt_range.cc:
Merge with 4.1
true -> TRUE and false -> FALSE
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 */ |