getopt: make --help option for SETS readablebb-10.2-daniel-getopt-sets-readable-outputbb-10.2-anel-getopt-sets-readable-output

3 files changed, 36 insertions, 33 deletions

diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff
index 4e93c2ade69..93017dab1c1 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/r/mysqld--help,win.rdiff
@@ -1,6 +1,8 @@
+diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
+index 51681bdc8d3..c80f1054af4 100644
 --- a/mysql-test/r/mysqld--help.result
 +++ b/mysql-test/r/mysqld--help.result
-@@ -341,7 +341,6 @@
+@@ -342,7 +342,6 @@
   The number of segments in a key cache
   -L, --language=name Client error messages in given language. May be given as
   a full path. Deprecated. Use --lc-messages-dir instead.
@@ -8,7 +10,7 @@
   --lc-messages=name  Set the language used for the error messages.
   -L, --lc-messages-dir=name 
   Directory where error messages are
-@@ -551,6 +550,7 @@
+@@ -552,6 +551,7 @@
   Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
   DATETIME, TIMESTAMP columns.
   (Defaults to on; use --skip-mysql56-temporal-format to disable.)
@@ -16,7 +18,7 @@
   --net-buffer-length=# 
   Buffer length for TCP/IP and socket communication
   --net-read-timeout=# 
-@@ -965,6 +965,9 @@
+@@ -966,6 +966,9 @@
   characteristics (isolation level, read only/read
   write,snapshot - but not any work done / data modified
   within the transaction).
@@ -26,7 +28,7 @@
   --show-slave-auth-info 
   Show user and password in SHOW SLAVE HOSTS on this
   master.
-@@ -1077,6 +1080,10 @@
+@@ -1078,6 +1081,10 @@
   Log slow queries to given log file. Defaults logging to
   'hostname'-slow.log. Must be enabled to activate other
   slow log options
@@ -37,7 +39,7 @@
   --socket=name       Socket file to use for connection
   --sort-buffer-size=# 
   Each thread that needs to do a sort allocates a buffer of
-@@ -1095,6 +1102,7 @@
+@@ -1096,6 +1103,7 @@
   NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
   --stack-trace       Print a symbolic stack trace on failure
   (Defaults to on; use --skip-stack-trace to disable.)
@@ -45,7 +47,7 @@
   --standard-compliant-cte 
   Allow only CTEs compliant to SQL standard
   (Defaults to on; use --skip-standard-compliant-cte to disable.)
-@@ -1143,6 +1151,11 @@
+@@ -1144,6 +1152,11 @@
   --thread-pool-max-threads=# 
   Maximum allowed number of worker threads in the thread
   pool
@@ -57,7 +59,7 @@
   --thread-pool-oversubscribe=# 
   How many additional active worker threads in a group are
   allowed.
-@@ -1181,8 +1194,8 @@
+@@ -1182,8 +1195,8 @@
   automatically convert it to an on-disk MyISAM or Aria
   table.
   -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
@@ -68,7 +70,7 @@
   --transaction-alloc-block-size=# 
   Allocation block size for transactions to be stored in
   binary log
-@@ -1308,7 +1321,6 @@
+@@ -1309,7 +1322,6 @@
  key-cache-division-limit 100
  key-cache-file-hash-size 512
  key-cache-segments 0
@@ -94,14 +96,14 @@
  silent-startup FALSE
  skip-grant-tables TRUE
 @@ -1503,6 +1518,7 @@
- slave-type-conversions 
+ slave-type-conversions (Empty set)
  slow-launch-time 2
  slow-query-log FALSE
 +slow-start-timeout 15000
  sort-buffer-size 2097152
  sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
  stack-trace TRUE
-@@ -1516,6 +1532,8 @@
+@@ -1521,6 +1537,8 @@
  thread-cache-size 151
  thread-pool-idle-timeout 60
  thread-pool-max-threads 65536
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 94f2ea0a28c..51681bdc8d3 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -151,8 +151,9 @@ The following specify which files/extra groups are read (specified before remain
  Short timeout for the two-step deadlock detection (in
  microseconds)
  --default-regex-flags=name 
- Default flags for the regex library. Any combination of: 
- DOTALL, DUPNAMES, EXTENDED, EXTRA, MULTILINE, UNGREEDY
+ Default flags for the regex library. For name, any
+ combination of: DOTALL, DUPNAMES, EXTENDED, EXTRA, 
+ MULTILINE, UNGREEDY
  --default-storage-engine=name 
  The default storage engine for new tables
  --default-time-zone=name 
@@ -386,8 +387,8 @@ The following specify which files/extra groups are read (specified before remain
  not specified then 'datadir'/'log-basename'.err or the
  'pid-file' path with extension .err is used
  --log-isam[=name]   Log all MyISAM changes to file.
- --log-output=name   How logs should be written. Any combination of: NONE, 
- FILE, TABLE
+ --log-output=name   How logs should be written. For name, any combination of:
+ NONE, FILE, TABLE
  --log-queries-not-using-indexes 
  Log queries that are executed without benefit of any
  index to the slow log if it is open
@@ -401,10 +402,10 @@ The following specify which files/extra groups are read (specified before remain
  administrative statements to the slow log if it is open.
  (Defaults to on; use --skip-log-slow-admin-statements to disable.)
  --log-slow-filter=name 
- Log only certain types of queries. Any combination of: 
- admin, filesort, filesort_on_disk, full_join, full_scan, 
- query_cache, query_cache_miss, tmp_table, 
- tmp_table_on_disk
+ Log only certain types of queries. For name, any
+ combination of: admin, filesort, filesort_on_disk, 
+ full_join, full_scan, query_cache, query_cache_miss, 
+ tmp_table, tmp_table_on_disk
  --log-slow-rate-limit=# 
  Write to slow log every #th slow query. Set to 1 to log
  everything. Increase it to reduce the size of the slow or
@@ -414,8 +415,8 @@ The following specify which files/extra groups are read (specified before remain
  log if it is open.
  (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
+ Verbosity level for the slow log. For name, any
+ combination of: innodb, query_plan, explain
  --log-tc=name       Path to transaction coordinator log (used for
  transactions that affect more than one storage engine,
  when binary log is disabled).
@@ -531,8 +532,8 @@ The following specify which files/extra groups are read (specified before remain
  MySQL tables
  --myisam-recover-options[=name] 
  Specifies how corrupted tables should be automatically
- repaired. Any combination of: DEFAULT, BACKUP, FORCE, 
- QUICK, BACKUP_ALL, OFF
+ repaired. For name, any combination of: DEFAULT, BACKUP, 
+ FORCE, QUICK, BACKUP_ALL, OFF
  --myisam-repair-threads=# 
  If larger than 1, when repairing a MyISAM table all
  indexes will be created in parallel, with one thread per
@@ -565,7 +566,7 @@ The following specify which files/extra groups are read (specified before remain
  See also --old-mode
  --old-alter-table   Use old, non-optimized alter table
  --old-mode=name     Used to emulate old behavior from earlier MariaDB or
- MySQL versions. Any combination of: 
+ MySQL versions. For name, any combination of: 
  NO_DUP_KEY_WARNINGS_WITH_IGNORE, NO_PROGRESS_INFO, 
  ZERO_DATE_TIME_CAST
  --old-passwords     Use old password encryption method (needed for 4.0 and
@@ -1063,8 +1064,8 @@ The following specify which files/extra groups are read (specified before remain
  --slave-type-conversions=name 
  Set of slave type conversions that are enabled. If the
  variable is empty, no conversions are allowed and it is
- expected that the types match exactly. Any combination
- of: ALL_LOSSY, ALL_NON_LOSSY
+ expected that the types match exactly. For name, any
+ combination of: ALL_LOSSY, ALL_NON_LOSSY
  --slow-launch-time=# 
  If creating the thread takes longer than this value (in
  seconds), the Slow_launch_threads counter will be
@@ -1081,8 +1082,8 @@ The following specify which files/extra groups are read (specified before remain
  --sort-buffer-size=# 
  Each thread that needs to do a sort allocates a buffer of
  this size
- --sql-mode=name     Sets the sql mode. Any combination of: REAL_AS_FLOAT, 
- PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, 
+ --sql-mode=name     Sets the sql mode. For name, any combination of: 
+ REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE,
  IGNORE_BAD_TABLE_OPTIONS, ONLY_FULL_GROUP_BY, 
  NO_UNSIGNED_SUBTRACTION, NO_DIR_IN_CREATE, POSTGRESQL, 
  ORACLE, MSSQL, DB2, MAXDB, NO_KEY_OPTIONS, 
@@ -1250,7 +1251,7 @@ deadlock-search-depth-long 15
 deadlock-search-depth-short 4
 deadlock-timeout-long 50000000
 deadlock-timeout-short 10000
-default-regex-flags 
+default-regex-flags (Empty set)
 default-storage-engine myisam
 default-time-zone (No default value)
 default-tmp-storage-engine (No default value)
@@ -1329,7 +1330,7 @@ log-slow-admin-statements TRUE
 log-slow-filter admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
 log-slow-rate-limit 1
 log-slow-slave-statements TRUE
-log-slow-verbosity 
+log-slow-verbosity (Empty set)
 log-tc tc.log
 log-warnings 2
 long-query-time 10
@@ -1383,7 +1384,7 @@ net-retry-count 10
 net-write-timeout 60
 old FALSE
 old-alter-table FALSE
-old-mode 
+old-mode (Empty set)
 old-passwords FALSE
 old-style-user-limits FALSE
 optimizer-prune-level 1
@@ -1499,7 +1500,7 @@ slave-run-triggers-for-rbr NO
 slave-skip-errors (No default value)
 slave-sql-verify-checksum TRUE
 slave-transaction-retries 10
-slave-type-conversions 
+slave-type-conversions (Empty set)
 slow-launch-time 2
 slow-query-log FALSE
 sort-buffer-size 2097152
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 13d0d7c240e..777eaf2cfd9 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -1522,7 +1522,7 @@ void my_print_help(const struct my_option *options)
         count= optp->typelib->count;
         break;
       case GET_SET: 
-        typelib_help= ". Any combination of: ";
+        typelib_help= ". For name, any combination of: ";
         count= optp->typelib->count;
         break;
       case GET_FLAGSET:
@@ -1599,7 +1599,7 @@ void my_print_variables(const struct my_option *options)
       switch ((optp->var_type & GET_TYPE_MASK)) {
       case GET_SET:
         if (!(llvalue= *(ulonglong*) value))
-	  printf("%s\n", "");
+	  printf("%s\n", "(Empty set)");
 	else
         for (nr= 0; llvalue && nr < optp->typelib->count; nr++, llvalue >>=1)
 	{