Merge with MySQL 5.1.52

This commit is contained in:
Michael Widenius 2010-11-23 23:39:59 +02:00
commit b52020221e
158 changed files with 4196 additions and 1942 deletions

View file

@ -112,7 +112,7 @@ int handle_options(int *argc, char ***argv,
const struct my_option *longopts,
my_get_one_option get_one_option)
{
uint opt_found, argvpos= 0, length;
uint UNINIT_VAR(opt_found), argvpos= 0, length;
my_bool end_of_options= 0, must_be_var, set_maximum_value,
option_is_loose;
char **pos, **pos_end, *optend, *opt_str, key_name[FN_REFLEN];
@ -121,7 +121,6 @@ int handle_options(int *argc, char ***argv,
void *value;
int error, i;
LINT_INIT(opt_found);
/* handle_options() assumes arg0 (program name) always exists */
DBUG_ASSERT(argc && *argc >= 1);
DBUG_ASSERT(argv && *argv);