Commit 4b13e338 authored by unknown's avatar unknown
Browse files

Merge 192.168.0.10:mysql/work/my51-work 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents babdd153 a763eeff

mysql-test/mysql-test-run.pl

+10 −0
Original line number Diff line number Diff line
@@ -3595,6 +3595,11 @@ sub mysqld_arguments ($$$$$) { 
      # Force mysqld to use log files up until 5.1.6

      mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});

    }

    else

    {

      # Turn on logging, will be sent to tables

      mtr_add_arg($args, "%s--log=", $prefix);

    }

  }



  if ( $type eq 'slave' )
@@ -3678,6 +3683,11 @@ sub mysqld_arguments ($$$$$) { 
      # Force mysqld to use log files up until 5.1.6

      mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});

    }

    else

    {

      # Turn on logging, will be sent to tables

      mtr_add_arg($args, "%s--log=", $prefix);

    }



  } # end slave

mysql-test/t/mysql_client_test-master.opt

+1 −1
Original line number Diff line number Diff line 
--log --log-output=FILE 
--log=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -2789,13 +2789,13 @@ static int init_common_variables(const char *conf_file_name, int argc, 
      !(log_output_options & LOG_NONE))

    sql_print_warning("Although a path was specified for the "

                      "--log option, log tables are used. "

                      "To enable logging to file use the --log-output option.");

                      "To enable logging to files use the --log-output option.");



  if (opt_slow_log && opt_slow_logname && !(log_output_options & LOG_FILE)

      && !(log_output_options & LOG_NONE))

    sql_print_warning("Although a path was specified for the "

                      "--log-slow-queries option, log tables are used. "

                      "To enable logging to file use the --log-output option.");

                      "To enable logging to files use the --log-output option.");



  if (!opt_logname)

    opt_logname= make_default_log_name(buff, ".log");