Commit 1fb5bd37 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
parents 1963159f d5e094d7

client/mysqltest.c

+9 −2
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static my_bool disable_query_log= 0, disable_result_log= 0; 
static my_bool disable_warnings= 0, disable_ps_warnings= 0;

static my_bool disable_info= 1;

static my_bool abort_on_error= 1;

static my_bool server_initialized= 0;



static char **default_argv;

static const char *load_default_groups[]= { "mysqltest", "client", 0 };
@@ -771,13 +772,18 @@ void free_used_memory() 
  free_all_replace();

  my_free(pass,MYF(MY_ALLOW_ZERO_PTR));

  free_defaults(default_argv);

  mysql_server_end();

  free_re();

#ifdef __WIN__

  free_tmp_sh_file();

  free_win_path_patterns();

#endif

  DBUG_VOID_RETURN;



  /* Only call mysql_server_end if mysql_server_init has been called */

  if (server_initialized)

    mysql_server_end();



  /* Don't use DBUG after mysql_server_end() */

  return;

}
@@ -5628,6 +5634,7 @@ int main(int argc, char **argv) 
			embedded_server_args,

			(char**) embedded_server_groups))

    die("Can't initialize MySQL server");

  server_initialized= 1;

  if (cur_file == file_stack && cur_file->file == 0)

  {

    cur_file->file= stdin;

mysql-test/t/mysqladmin.test

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
database=db1

EOF



--replace_regex /\/.*mysqladmin/mysqladmin/

--replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/

--error 7

--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT  -u root --password= ping 2>&1
@@ -27,6 +27,6 @@ EOF 
loose-database=db2

EOF



--replace_regex /Warning: .*mysqladmin/Warning: mysqladmin/

--replace_regex /Warning: .*mysqladmin.*: unknown/Warning: mysqladmin: unknown/

--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT  -u root --password= ping 2>&1

mysys/my_getopt.c

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ static void default_reporter(enum loglevel level, 
    fprintf(stderr, "%s", "Info: ");

  vfprintf(stderr, format, args);

  va_end(args);

  fflush(stderr);

}



/*