diff options
| -rw-r--r-- | client/mysqltest.c | 11 | ||||
| -rw-r--r-- | mysql-test/t/mysqladmin.test | 4 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index aecb5141e15..4eb17fc5f7a 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -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; diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index 7c016fd7416..850abc1ee69 100644 --- a/mysql-test/t/mysqladmin.test +++ b/mysql-test/t/mysqladmin.test @@ -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 diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index c26c3dd46e0..8267fa5c0af 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -70,6 +70,7 @@ static void default_reporter(enum loglevel level, fprintf(stderr, "%s", "Info: "); vfprintf(stderr, format, args); va_end(args); + fflush(stderr); } /* |