merge

mysql-test/r/mysqld--help-notwin.result

@@ -709,7 +709,7 @@ The following options may be given as the first argument:
 
 Variables (--variable-name=value)
 and boolean options {FALSE|TRUE}  Value (after reading options)
------------------------------------ --------------------------------------
+--------------------------------- ----------------------------------------
 abort-slave-event-count           0
 allow-suspicious-udfs             FALSE
 auto-increment-increment          1