mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
7eea262321
- Fixed Bug#2346
- Fixed Bug#2378
- Fixed bug in pager (no Bug#ID (?))
- Added support for new special situations option type, GET_DISABLED.
See handling of --debug in mysql.cc. compiled wihtout debugging, as an
example.
client/mysql.cc:
- Added missing documentation to some options.
- Fixed a bug in pager (no Bug#ID found (?)), but reported on internals list
with subject "[PATCH] Fix pager problems in mysql client"
- Fixed Bug#2346, "unique prefix is enough" option behaviour can be confusing with --debug
include/my_getopt.h:
Added new option type, GET_DISABLED.
include/mysys_err.h:
New exit code for my_getopt.
mysys/my_getopt.c:
- Added handling for GET_DISABLED option type (Fix for Bug#2346)
- Fixed Bug#2378, "Problem with option abbreviation"
62 lines
2.6 KiB
C
62 lines
2.6 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
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_ASK_ADDR 128
|
|
#define GET_TYPE_MASK 127
|
|
|
|
enum get_opt_arg_type { NO_ARG, OPT_ARG, REQUIRED_ARG };
|
|
|
|
struct my_option
|
|
{
|
|
const char *name; /* Name of the option */
|
|
int id; /* unique id or short option */
|
|
const char *comment; /* option comment, for autom. --help */
|
|
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;
|
|
enum get_opt_arg_type arg_type;
|
|
longlong def_value; /* Default value */
|
|
longlong min_value; /* Min allowed value */
|
|
longlong max_value; /* Max allowed value */
|
|
longlong sub_size; /* Subtract this from given value */
|
|
long block_size; /* Value should be a mult. of this */
|
|
int app_type; /* To be used by an application */
|
|
};
|
|
|
|
extern char *disabled_my_option;
|
|
extern my_bool my_getopt_print_errors;
|
|
|
|
extern int handle_options (int *argc, char ***argv,
|
|
const struct my_option *longopts,
|
|
my_bool (*get_one_option)(int,
|
|
const struct my_option *,
|
|
char *));
|
|
extern void my_print_help(const struct my_option *options);
|
|
extern void my_print_variables(const struct my_option *options);
|
|
extern void my_getopt_register_get_addr(gptr* (*func_addr)(const char *, uint,
|
|
const struct my_option *));
|
|
|
|
ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp);
|
|
my_bool getopt_compare_strings(const char *s, const char *t, uint length);
|
|
C_MODE_END
|