diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 7b0ce27ead3..60ee8426ccd 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -490,6 +490,7 @@ The following specify which files/extra groups are read (specified before remain
  administrative statements to the slow log if it is open. 
  Resets or sets the option 'admin' in
  log_slow_disabled_statements
+ (Defaults to on; use --skip-log-slow-admin-statements to disable.)
  --log-slow-disabled-statements=name 
  Don't log certain types of statements to slow log. Any
  combination of: admin, call, slave, sp
@@ -510,6 +511,7 @@ The following specify which files/extra groups are read (specified before remain
  Log slow statements executed by slave thread to the slow
  log if it is open. Resets or sets the option 'slave' in
  log_slow_disabled_statements
+ (Defaults to on; use --skip-log-slow-slave-statements to disable.)
  --log-slow-verbosity=name 
  Verbosity level for the slow log. Any combination of: 
  innodb, query_plan, explain
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 9747ee4214e..cb0e0e61240 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -1583,7 +1583,8 @@ void my_print_help(const struct my_option *options)
       }
     }
     putchar('\n');
-    if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL)
+    if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL ||
+        (optp->var_type & GET_TYPE_MASK) == GET_BIT)
     {
       if (optp->def_value != 0)
       {