Give a more precise warning why something fails.

Fixed typo that caused warnings from mysql-test-run

mysql-test/mysql-test-run.pl:
  Fixed typo
sql/mysqld.cc:
  Give a more precise warning why something fails.
This commit is contained in:
Michael Widenius 2010-09-08 02:00:12 +03:00
parent 172356b081
commit 01b100b5dd
2 changed files with 2 additions and 3 deletions

View File

@ -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/,

View File

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