[Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2911)

Michael Widenius monty at askmonty.org
Wed Sep 8 02:00:14 EEST 2010


#At lp:maria based on revid:monty at askmonty.org-20100907205700-umo47xvex7umxwt8

 2911 Michael Widenius	2010-09-08
      Give a more precise warning why something fails.
      Fixed typo that caused warnings from mysql-test-run
      modified:
        mysql-test/mysql-test-run.pl
        sql/mysqld.cc

per-file messages:
  mysql-test/mysql-test-run.pl
    Fixed typo
  sql/mysqld.cc
    Give a more precise warning why something fails.
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-09-07 20:46:10 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-09-07 23:00:12 +0000
@@ -4228,7 +4228,7 @@ sub extract_warning_lines ($) {
      qr/slave SQL thread aborted/,
      qr/unknown option '--loose[-_]/,
      qr/unknown variable 'loose[-_]/,
-     or/Invalid .*old.* table or database name/,
+     qr/Invalid .*old.* table or database name/,
      qr/Now setting lower_case_table_names to [02]/,
      qr/Setting lower_case_table_names=2/,
      qr/You have forced lower_case_table_names to 0/,

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-09-07 20:57:00 +0000
+++ b/sql/mysqld.cc	2010-09-07 23:00:12 +0000
@@ -8786,8 +8786,7 @@ mysqld_get_one_option(int optid,
     if (!slave_warning_issued)                 //only show the warning once
     {
       slave_warning_issued = true;   
-      WARN_DEPRECATED(NULL, "6.0", "for replication startup options", 
-        "'CHANGE MASTER'");
+      WARN_DEPRECATED(NULL, "6.0", opt->name, "'CHANGE MASTER'");
     }
     break;
   case OPT_CONSOLE:



More information about the commits mailing list