bzr commit into mysql-6.0-backup branch (jorgen.loland:2732) Bug#40282

[Jorgen Loland]

#At file:///localhome/jl208045/mysql/mysql-6.0-backup-40282/

 2732 Jorgen Loland	2008-11-13
      Bug#40282: --log-backup-output w/o argument sets logging to wrong value
      
      Default value for --log-backup-output is TABLE. Before, the option defaulted to FILE
if specified without argument. Now, it defaults to TABLE.
added:
  mysql-test/suite/backup/r/backup_logs_output_emptyopt.result
  mysql-test/suite/backup/t/backup_logs_output_emptyopt-master.opt
  mysql-test/suite/backup/t/backup_logs_output_emptyopt.test
modified:
  sql/mysqld.cc

per-file messages:
  mysql-test/suite/backup/r/backup_logs_output_emptyopt.result
    Results from test that checks that --log-backup-output defaults to TABLE if option
specified without argument
  mysql-test/suite/backup/t/backup_logs_output_emptyopt-master.opt
    Option file for test that checks that --log-backup-output defaults to TABLE if option
specified without argument
  mysql-test/suite/backup/t/backup_logs_output_emptyopt.test
    Test to check that --log-backup-output defaults to TABLE if option specified without
argument
  sql/mysqld.cc
    Make backup log output default to TABLE if option specified without argument.
=== added file 'mysql-test/suite/backup/r/backup_logs_output_emptyopt.result'
--- a/mysql-test/suite/backup/r/backup_logs_output_emptyopt.result	1970-01-01 00:00:00
+0000
+++ b/mysql-test/suite/backup/r/backup_logs_output_emptyopt.result	2008-11-13 11:50:23
+0000
@@ -0,0 +1,4 @@
+Should default to TABLE
+SHOW VARIABLES LIKE 'log_backup_output';
+Variable_name	Value
+log_backup_output	TABLE

=== added file 'mysql-test/suite/backup/t/backup_logs_output_emptyopt-master.opt'
--- a/mysql-test/suite/backup/t/backup_logs_output_emptyopt-master.opt	1970-01-01 00:00:00
+0000
+++ b/mysql-test/suite/backup/t/backup_logs_output_emptyopt-master.opt	2008-11-13 11:50:23
+0000
@@ -0,0 +1 @@
+--log-backup-output
\ No newline at end of file

=== added file 'mysql-test/suite/backup/t/backup_logs_output_emptyopt.test'
--- a/mysql-test/suite/backup/t/backup_logs_output_emptyopt.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup/t/backup_logs_output_emptyopt.test	2008-11-13 11:50:23 +0000
@@ -0,0 +1,13 @@
+#
+# This test tests the --log-backup-output option for writing backup
+# log information when the option is not given a value. The result of
+# specifying the option without giving a value should be the default
+# value, which is TABLE.
+#
+# backup_logs_output.test tests all other aspects of this option.
+#
+
+--source include/not_embedded.inc
+
+--echo Should default to TABLE
+SHOW VARIABLES LIKE 'log_backup_output';

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-11-10 16:49:10 +0000
+++ b/sql/mysqld.cc	2008-11-13 11:50:23 +0000
@@ -8284,7 +8284,7 @@ mysqld_get_one_option(int optid,
   {
     if (!argument || !argument[0])
     {
-      log_backup_output_options= LOG_FILE;
+      log_backup_output_options= LOG_TABLE;
       log_backup_output_str= log_output_typelib.type_names[1];
     }
     else