Commit 88dd3c59 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysys/my_getopt.c:
  Auto merged
parents fc9a6bc5 d2429209

mysql-test/mysql-test-run.pl

+4 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,10 @@ sub environment_setup () { 
  # ----------------------------------------------------

  $ENV{'MYSQL_MY_PRINT_DEFAULTS'}=  $exe_my_print_defaults;



  # ----------------------------------------------------

  # Setup env so childs can execute mysqladmin

  # ----------------------------------------------------

  $ENV{'MYSQLADMIN'}=  $exe_mysqladmin;



  # ----------------------------------------------------

  # Setup env so childs can execute perror

mysql-test/r/mysqladmin.result

0 → 100644
+4 −0
Original line number Diff line number Diff line 
mysqld is alive

mysqladmin: unknown variable 'database=db1'

Warning: mysqladmin: unknown variable 'loose-database=db2'

mysqld is alive

mysql-test/t/mysqladmin.test

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#

# Test "mysqladmin ping"

#



--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT  -u root --password= ping 2>&1





#

# Bug#10608 mysqladmin breaks on "database" variable in my.cnf

#



# When mysqladmin finds database in .cnf file it shall fail

--write_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf

[client]

database=db1

EOF



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

--error 7

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





# When mysqladmin finds "loose-database" in .cnf file it shall print

# a warning and continue

--write_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf

[client]

loose-database=db2

EOF



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

--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

+5 −1
Original line number Diff line number Diff line
@@ -59,11 +59,15 @@ char *disabled_my_option= (char*) "0"; 


my_bool my_getopt_print_errors= 1;



static void default_reporter(enum loglevel level __attribute__((unused)),

static void default_reporter(enum loglevel level,

                             const char *format, ...)

{

  va_list args;

  va_start(args, format);

  if (level == WARNING_LEVEL)

    fprintf(stderr, "%s", "Warning: ");

  else if (level == INFORMATION_LEVEL)

    fprintf(stderr, "%s", "Info: ");

  vfprintf(stderr, format, args);

  va_end(args);

}