Commit 01b100b5 authored by Michael Widenius's avatar Michael Widenius

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.
parent 172356b0
...@@ -4228,7 +4228,7 @@ sub extract_warning_lines ($) { ...@@ -4228,7 +4228,7 @@ sub extract_warning_lines ($) {
qr/slave SQL thread aborted/, qr/slave SQL thread aborted/,
qr/unknown option '--loose[-_]/, qr/unknown option '--loose[-_]/,
qr/unknown variable '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/Now setting lower_case_table_names to [02]/,
qr/Setting lower_case_table_names=2/, qr/Setting lower_case_table_names=2/,
qr/You have forced lower_case_table_names to 0/, qr/You have forced lower_case_table_names to 0/,
......
...@@ -8786,8 +8786,7 @@ mysqld_get_one_option(int optid, ...@@ -8786,8 +8786,7 @@ mysqld_get_one_option(int optid,
if (!slave_warning_issued) //only show the warning once if (!slave_warning_issued) //only show the warning once
{ {
slave_warning_issued = true; slave_warning_issued = true;
WARN_DEPRECATED(NULL, "6.0", "for replication startup options", WARN_DEPRECATED(NULL, "6.0", opt->name, "'CHANGE MASTER'");
"'CHANGE MASTER'");
} }
break; break;
case OPT_CONSOLE: case OPT_CONSOLE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment