bzr push into mysql-trunk branch (jon.hauglid:5251 to 5252)

[Jon Olav Hauglid]

 5252 Jon Olav Hauglid	2012-12-14 [merge]
      Merge from mysql-5.6 to mysql-trunk

    modified:
      mysql-test/include/mtr_warnings.sql
      mysql-test/include/mysqld--help.inc
      scripts/mysqldumpslow.sh
      sql/mysqld.cc
 5251 Bill Qu	2012-12-14 [merge]
      Approved by Jimmy and Inaam. rb#1576

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	revid:bill.qu@stripped
+++ b/mysql-test/include/mtr_warnings.sql	revid:jon.hauglid@stripped
@@ -178,7 +178,8 @@ INSERT INTO global_suppressions VALUES
 
  /* Added 2009-08-XX after fixing Bug #42408 */
 
- ("Although a path was specified for the .* option, log tables are used"),
+ ("Although a path was specified for the --general-log-file option, log tables are used"),
+ ("Although a path was specified for the --slow-query-log-file option, log tables are used"),
  ("Backup: Operation aborted"),
  ("Restore: Operation aborted"),
  ("Restore: The grant .* was skipped because the user does not exist"),

=== modified file 'mysql-test/include/mysqld--help.inc'
--- a/mysql-test/include/mysqld--help.inc	revid:bill.qu@stripped
+++ b/mysql-test/include/mysqld--help.inc	revid:jon.hauglid@stripped
@@ -16,8 +16,8 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-li
 perl;
   # Variables which we don't want to display in the result file since
   # their paths may vary:
-  @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
-               log-slow-queries pid-file slow-query-log-file
+  @skipvars=qw/basedir open-files-limit general-log-file plugin-dir
+               pid-file slow-query-log-file
 			   datadir slave-load-tmpdir tmpdir socket table-definition-cache table-open-cache/;
 
   # Plugins which may or may not be there:

=== modified file 'scripts/mysqldumpslow.sh'
--- a/scripts/mysqldumpslow.sh	revid:bill.qu@stripped
+++ b/scripts/mysqldumpslow.sh	revid:jon.hauglid@stripped
@@ -58,7 +58,7 @@ unless (@ARGV) {
     warn "basedir=$basedir\n" if $opt{v};
 
     my $datadir = ($defaults =~ m/--datadir=(.*)/)[0];
-    my $slowlog = ($defaults =~ m/--log-slow-queries=(.*)/)[0];
+    my $slowlog = ($defaults =~ m/--slow-query-log-file=(.*)/)[0];
     if (!$datadir or $opt{i}) {
 	# determine the datadir from the instances section of /etc/my.cnf, if any
 	my $instances  = `my_print_defaults instances`;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	revid:bill.qu@stripped
+++ b/sql/mysqld.cc	revid:jon.hauglid@stripped
@@ -4003,13 +4003,13 @@ int init_common_variables()
   if (opt_log && opt_logname && !(log_output_options & LOG_FILE) &&
       !(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 files use the --log-output option.");
+                      "--general-log-file option, log tables are used. "
+                      "To enable logging to files use the --log-output=file 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. "
+                      "--slow-query-log-file option, log tables are used. "
                       "To enable logging to files use the --log-output=file option.");
 
 #define FIX_LOG_VAR(VAR, ALT)                                   \
@@ -8615,7 +8615,10 @@ static int get_options(int *argc_ptr, ch
   if ((opt_log_slow_admin_statements || opt_log_queries_not_using_indexes ||
        opt_log_slow_slave_statements) &&
       !opt_slow_log)
-    sql_print_warning("options --log-slow-admin-statements, --log-queries-not-using-indexes and --log-slow-slave-statements have no effect if --log_slow_queries is not set");
+    sql_print_warning("options --log-slow-admin-statements, "
+                      "--log-queries-not-using-indexes and "
+                      "--log-slow-slave-statements have no effect if "
+                      "--slow-query-log is not set");
   if (global_system_variables.net_buffer_length >
       global_system_variables.max_allowed_packet)
   {

No bundle (reason: useless for push emails).