summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/gen_lex_hash.cc2
-rw-r--r--sql/mysqld.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index 72ab1184533..1e78aa35195 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -384,7 +384,7 @@ static int get_options(int argc, char **argv)
{
int ho_error;
- if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, 0)))
+ if ((ho_error= handle_options(&argc, &argv, my_long_options, get_one_option)))
exit(ho_error);
if (argc >= 1)
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 1068c5ec9a1..1e682e16d1f 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5119,8 +5119,8 @@ static void get_options(int argc,char **argv)
{
int ho_error;
- if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option,
- option_error_reporter)))
+ my_getopt_error_reporter= option_error_reporter;
+ if ((ho_error= handle_options(&argc, &argv, my_long_options, get_one_option)))
exit(ho_error);
#if defined(HAVE_BROKEN_REALPATH)