WL#4738 streamline/simplify @@variable creation process

Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables
Bug#20415 Output of mysqld --help --verbose is incomplete
Bug#25430 variable not found in SELECT @@global.ft_max_word_len;
Bug#32902 plugin variables don't know their names
Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
Bug#34829 No default value for variable and setting default does not raise error
Bug#34834 ? Is accepted as a valid sql mode
Bug#34878 Few variables have default value according to documentation but error occurs  
Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var.
Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status
Bug#40988 log_output_basic.test succeeded though syntactically false.
Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails)
Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations 
Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
Bug#44797 plugins w/o command-line options have no disabling option in --help
Bug#46314 string system variables don't support expressions
Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken
Bug#46586 When using the plugin interface the type "set" for options caused a crash.
Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number
Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
Bug#49417 some complaints about mysqld --help --verbose output
Bug#49540 DEFAULT value of binlog_format isn't the default value
Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
Bug#49644 init_connect and \0
Bug#49645 init_slave and multi-byte characters
Bug#49646 mysql --show-warnings crashes when server dies


CMakeLists.txt:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
client/mysql.cc:
  don't crash with --show-warnings when mysqld dies
config/ac-macros/plugins.m4:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
include/my_getopt.h:
  comments
include/my_pthread.h:
  fix double #define
mysql-test/mysql-test-run.pl:
  run sys_vars suite by default
  properly recognize envirinment variables (e.g. MTR_MAX_SAVE_CORE) set to 0
  escape gdb command line arguments
mysql-test/suite/sys_vars/r/rpl_init_slave_func.result:
  init_slave+utf8 bug
mysql-test/suite/sys_vars/t/rpl_init_slave_func.test:
  init_slave+utf8 bug
mysys/my_getopt.c:
  Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
  Bug#46586 When using the plugin interface the type "set" for options caused a crash.
  Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
mysys/typelib.c:
  support for flagset
sql/ha_ndbcluster.cc:
  backport from telco tree
sql/item_func.cc:
  Bug#49644 init_connect and \0
  Bug#49645 init_slave and multi-byte characters
sql/sql_builtin.cc.in:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
sql/sql_plugin.cc:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
  Bug#32902 plugin variables don't know their names
  Bug#44797 plugins w/o command-line options have no disabling option in --help
sql/sys_vars.cc:
  all server variables are defined here
storage/myisam/ft_parser.c:
  remove unnecessary updates of param->quot
storage/myisam/ha_myisam.cc:
  myisam_* variables belong here
strings/my_vsnprintf.c:
  %o and %llx
unittest/mysys/my_vsnprintf-t.c:
  %o and %llx tests
vio/viosocket.c:
  bugfix: fix @@wait_timeout to work with socket timeouts (vs. alarm thread)

7 files changed, 58 insertions, 8 deletions

diff --git a/mysql-test/include/diff_tables.inc b/mysql-test/include/diff_tables.inc
index d15dd56b35d..ad42615511a 100644
--- a/mysql-test/include/diff_tables.inc
+++ b/mysql-test/include/diff_tables.inc
@@ -60,6 +60,7 @@ disable_query_log;
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/tmp/diff_table_2
 
+
 let $_diff_table=$diff_table_2;
 let $_diff_i=2;
 while ($_diff_i) {
diff --git a/mysql-test/include/have_thread_concurrency.inc b/mysql-test/include/have_thread_concurrency.inc
new file mode 100644
index 00000000000..730edbf4895
--- /dev/null
+++ b/mysql-test/include/have_thread_concurrency.inc
@@ -0,0 +1,10 @@
+disable_query_log;
+disable_result_log;
+set @have_thread_concurrency=0;
+select @have_thread_concurrency:=1 from information_schema.global_variables where variable_name='thread_concurrency';
+if (`select @have_thread_concurrency = 0`)
+{
+  skip Need @@thread_concurrency;
+}
+enable_result_log;
+enable_query_log;
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc
index d137b0957c0..ef116c5addc 100644
--- a/mysql-test/include/index_merge1.inc
+++ b/mysql-test/include/index_merge1.inc
@@ -303,7 +303,7 @@ drop table t4;
 create table t4 (a int);
 insert into t4 values (1),(4),(3);
 set @save_join_buffer_size=@@join_buffer_size;
-set join_buffer_size= 4000;
+set join_buffer_size= 4096;
 explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
  from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
   where (A.key1 < 500000 or A.key2 < 3)
diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc
new file mode 100644
index 00000000000..11945e6606a
--- /dev/null
+++ b/mysql-test/include/mysqld--help.inc
@@ -0,0 +1,39 @@
+#
+# mysqld --help
+#
+--source include/not_embedded.inc
+
+#
+# force lower-case-table-names=1 (linux/macosx have different defaults)
+# force symbolic-links=0 (valgrind build has a different default)
+#
+exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>&1;
+
+perl;
+  @skipvars=qw/basedir character-sets-dir datadir
+               general-log-file language lc-messages-dir
+               log log-slow-queries pid-file plugin-dir slave-load-tmpdir
+               slow-query-log-file tmpdir open-files-limit/;
+  @plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool
+              thread-concurrency super-large-pages/;
+  $re1=join('|', @skipvars, @plugins);
+  $re2=join('|', @plugins);
+  $skip=0;
+  open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die;
+  while (<F>) {
+    next if 1../The following groups are read/;
+    next if /^($re1) /;
+    next if /^($re2)-/;
+    $skip=0 if /^  -/;
+    $skip=1 if / --($re2)\b/;
+    # fixes for 32-bit
+    s/\b4294967295\b/18446744073709551615/;
+    s/\b2146435072\b/9223372036853727232/;
+    s/\b196608\b/262144/;
+    next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
+    next if $skip;
+    print;
+  }
+  close F;
+EOF
+
diff --git a/mysql-test/include/query_cache.inc b/mysql-test/include/query_cache.inc
index 7ce97b42158..0cc1ebb21d6 100644
--- a/mysql-test/include/query_cache.inc
+++ b/mysql-test/include/query_cache.inc
@@ -114,7 +114,7 @@ connection default;
 # This should be 'YES'.
 SHOW VARIABLES LIKE 'have_query_cache';
 
-SET GLOBAL query_cache_size = 200000;
+SET GLOBAL query_cache_size = 204800;
 flush status;
 SET @@autocommit=1;
 eval SET SESSION STORAGE_ENGINE = $engine_type;
diff --git a/mysql-test/include/query_cache_sql_prepare.inc b/mysql-test/include/query_cache_sql_prepare.inc
index baa041aa058..769cd535f37 100644
--- a/mysql-test/include/query_cache_sql_prepare.inc
+++ b/mysql-test/include/query_cache_sql_prepare.inc
@@ -27,7 +27,7 @@ connect (con1,localhost,root,,test,$MASTER_MYPORT,);
 connection default;
 
 set @initial_query_cache_size = @@global.query_cache_size;
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
 flush status;
 --disable_warnings
 drop table if exists t1;
@@ -178,7 +178,7 @@ show status like 'Qcache_hits';
 # then QC is re-enabled for more EXECUTE.
 --echo ---- switch to connection default ----
 connection default;
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 # Expect to see additional Qcache_hits.
 # The fact that the QC was temporary disabled should have no affect
 # except that the first execute will not hit results from the
@@ -235,7 +235,7 @@ prepare stmt3 from "select * from t1 where c1=10";
 --echo ---- switch to connection default ----
 connection default;
 # then QC is enabled at EXECUTE
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 show status like 'Qcache_hits';
 execute stmt1;
 show status like 'Qcache_hits';
@@ -260,7 +260,7 @@ connection default;
 set global query_cache_size=0;
 prepare stmt1 from "select * from t1 where c1=?";
 # then QC is enabled at EXECUTE
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 show status like 'Qcache_hits';
 set @a=1;
 execute stmt1 using @a;
@@ -509,7 +509,7 @@ execute stmt;
 set @@global.query_cache_size=0;
 alter table t1 add column b int;
 execute stmt;
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
 execute stmt;
 execute stmt;
 --echo #
diff --git a/mysql-test/include/show_slave_status2.inc b/mysql-test/include/show_slave_status2.inc
index 9c4e14c62c2..7e970b31d8e 100644
--- a/mysql-test/include/show_slave_status2.inc
+++ b/mysql-test/include/show_slave_status2.inc
@@ -3,6 +3,6 @@
 
 # masked out log positions
 
---replace_result $MASTER_MYPORT MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT $DEFAULT_MASTER_PORT 3306
 --replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 #
 query_vertical SHOW SLAVE STATUS;