update test cases and results

mysql-test/r/information_schema.result

@@ -1564,50 +1564,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 explain select count(*) from information_schema.views;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	views	ALL	NULL	NULL	NULL	NULL	NULL	Open_frm_only; Scanned all databases
-set global init_connect="drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;";
-select * from information_schema.global_variables where variable_name='init_connect';
-VARIABLE_NAME	VARIABLE_VALUE
-INIT_CONNECT	drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists t1;
-drop table if exists t1;drop table if exists
+set global init_connect=repeat("drop table if exists t1;", 100);
+select length(@@global.init_connect), length(variable_value) from information_schema.global_variables where variable_name='init_connect';
+length(@@global.init_connect)	length(variable_value)
+2400	2048
 Warnings:
 Warning	1265	Data truncated for column 'VARIABLE_VALUE' at row 1
 set global init_connect="";

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

@@ -851,6 +851,75 @@ The following options may be given as the first argument:
  -V, --version       Output version information and exit.
  --wait-timeout=#    The number of seconds the server waits for activity on a
  connection before closing it
+ --wsrep-OSU-method[=name] 
+ Method for Online Schema Upgrade
+ --wsrep-auto-increment-control 
+ To automatically control the assignment of autoincrement
+ variables
+ (Defaults to on; use --skip-wsrep-auto-increment-control to disable.)
+ --wsrep-causal-reads 
+ Enable "strictly synchronous" semantics for read
+ operations
+ --wsrep-certify-nonPK 
+ Certify tables with no primary key
+ (Defaults to on; use --skip-wsrep-certify-nonPK to disable.)
+ --wsrep-cluster-address=name 
+ Address to initially connect to cluster
+ --wsrep-cluster-name=name 
+ Name for the cluster
+ --wsrep-convert-LOCK-to-trx 
+ To convert locking sessions into transactions
+ --wsrep-data-home-dir=name 
+ home directory for wsrep provider
+ --wsrep-dbug-option=name 
+ DBUG options to provider library
+ --wsrep-debug       To enable debug level logging
+ --wsrep-drupal-282555-workaround 
+ To use a workaround forbad autoincrement value
+ --wsrep-forced-binlog-format=name 
+ binlog format to take effect over user's choice
+ --wsrep-log-conflicts 
+ To log multi-master conflicts
+ --wsrep-max-ws-rows=# 
+ Max number of rows in write set
+ --wsrep-max-ws-size=# 
+ Max write set size (bytes)
+ --wsrep-mysql-replication-bundle=# 
+ mysql replication group commit 
+ --wsrep-node-address=name 
+ Node address
+ --wsrep-node-incoming-address=name 
+ Client connection address
+ --wsrep-node-name=name 
+ Node name
+ --wsrep-notify-cmd=name 
+ --wsrep-on          To enable wsrep replication 
+ (Defaults to on; use --skip-wsrep-on to disable.)
+ --wsrep-provider=name 
+ Path to replication provider library
+ --wsrep-provider-options=name 
+ provider specific options
+ --wsrep-recover     Recover database state after crash and exit
+ --wsrep-replicate-myisam 
+ To enable myisam replication
+ --wsrep-retry-autocommit=# 
+ Max number of times to retry a failed autocommit
+ statement
+ --wsrep-slave-threads=# 
+ Number of slave appliers to launch
+ --wsrep-sst-auth=name 
+ Authentication for SST connection
+ --wsrep-sst-donor=name 
+ preferred donor node for the SST
+ --wsrep-sst-donor-rejects-queries 
+ Reject client queries when donating state snapshot
+ transfer
+ --wsrep-sst-method=name 
+ State snapshot transfer method
+ --wsrep-sst-receive-address=name 
+ Address where node is waiting for SST contact
+ --wsrep-start-position=name 
+ global transaction position to start from 
 
 Variables (--variable-name=value)
 allow-suspicious-udfs FALSE
@@ -1099,6 +1168,39 @@ updatable-views-with-limit YES
 userstat FALSE
 verbose TRUE
 wait-timeout 28800
+wsrep-OSU-method TOI
+wsrep-auto-increment-control TRUE
+wsrep-causal-reads FALSE
+wsrep-certify-nonPK TRUE
+wsrep-cluster-address 
+wsrep-cluster-name my_wsrep_cluster
+wsrep-convert-LOCK-to-trx FALSE
+wsrep-data-home-dir 
+wsrep-dbug-option 
+wsrep-debug FALSE
+wsrep-drupal-282555-workaround FALSE
+wsrep-forced-binlog-format NONE
+wsrep-log-conflicts FALSE
+wsrep-max-ws-rows 131072
+wsrep-max-ws-size 1073741824
+wsrep-mysql-replication-bundle 0
+wsrep-node-address 
+wsrep-node-incoming-address AUTO
+wsrep-node-name meddwl
+wsrep-notify-cmd 
+wsrep-on FALSE
+wsrep-provider none
+wsrep-provider-options 
+wsrep-recover FALSE
+wsrep-replicate-myisam FALSE
+wsrep-retry-autocommit 1
+wsrep-slave-threads 1
+wsrep-sst-auth (No default value)
+wsrep-sst-donor 
+wsrep-sst-donor-rejects-queries FALSE
+wsrep-sst-method mysqldump
+wsrep-sst-receive-address AUTO
+wsrep-start-position 00000000-0000-0000-0000-000000000000:-1
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.

mysql-test/r/show_check.result

@@ -101,19 +101,19 @@ drop table t1;
 show variables like "wait_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	information_schema	VARIABLES	VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	1024	5	Y	0	0	8
+def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	2048	5	Y	0	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "WAIT_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	information_schema	VARIABLES	VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	1024	5	Y	0	0	8
+def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	2048	5	Y	0	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	information_schema	VARIABLES	VARIABLES	VARIABLE_NAME	Variable_name	253	64	0	N	1	0	8
-def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	1024	0	Y	0	0	8
+def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	2048	0	Y	0	0	8
 Variable_name	Value
 show table status from test like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

mysql-test/suite/funcs_1/r/is_columns_is.result

@@ -134,9 +134,9 @@ def	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL
 def	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NULL	NULL	datetime			select	
 def	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select	
 def	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select	
+def	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2048)			select	
 def	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select	
+def	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2048)			select	
 def	information_schema	INDEX_STATISTICS	INDEX_NAME	3		NO	varchar	192	576	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select	
 def	information_schema	INDEX_STATISTICS	ROWS_READ	4	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select	
 def	information_schema	INDEX_STATISTICS	TABLE_NAME	2		NO	varchar	192	576	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(192)			select	
@@ -284,9 +284,9 @@ def	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NUL
 def	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2		NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 def	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select	
+def	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2048)			select	
 def	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select	
+def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	varchar	2048	6144	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(2048)			select	
 def	information_schema	STATISTICS	CARDINALITY	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(21)			select	
 def	information_schema	STATISTICS	COLLATION	9	NULL	YES	varchar	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1)			select	
 def	information_schema	STATISTICS	COLUMN_NAME	8		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -602,9 +602,9 @@ NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) uns
 3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
 3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	varchar	1024	3072	utf8	utf8_general_ci	varchar(1024)
+3.0000	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	varchar	2048	6144	utf8	utf8_general_ci	varchar(2048)
 3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	varchar	1024	3072	utf8	utf8_general_ci	varchar(1024)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	varchar	2048	6144	utf8	utf8_general_ci	varchar(2048)
 3.0000	information_schema	INDEX_STATISTICS	TABLE_SCHEMA	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 3.0000	information_schema	INDEX_STATISTICS	TABLE_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
 3.0000	information_schema	INDEX_STATISTICS	INDEX_NAME	varchar	192	576	utf8	utf8_general_ci	varchar(192)
@@ -752,9 +752,9 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	SESSION_STATUS	VARIABLE_VALUE	varchar	1024	3072	utf8	utf8_general_ci	varchar(1024)
+3.0000	information_schema	SESSION_STATUS	VARIABLE_VALUE	varchar	2048	6144	utf8	utf8_general_ci	varchar(2048)
 3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-3.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	varchar	1024	3072	utf8	utf8_general_ci	varchar(1024)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	varchar	2048	6144	utf8	utf8_general_ci	varchar(2048)
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)

mysql-test/suite/innodb/r/innodb-autoinc.result

@@ -201,6 +201,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	100
 auto_increment_offset	10
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -234,6 +235,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -273,6 +275,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -286,6 +289,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	100
 auto_increment_offset	10
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (-2), (NULL),(2),(NULL);
 INSERT INTO t1 VALUES (250),(NULL);
 SELECT * FROM t1;
@@ -319,6 +323,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -334,6 +339,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	100
 auto_increment_offset	10
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (-2);
 Warnings:
 Warning	1264	Out of range value for column 'c1' at row 1
@@ -374,6 +380,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -389,6 +396,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	100
 auto_increment_offset	10
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (-2),(NULL),(2),(NULL);
 Warnings:
 Warning	1264	Out of range value for column 'c1' at row 1
@@ -423,6 +431,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -438,6 +447,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	2
 auto_increment_offset	10
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
 SELECT * FROM t1;
 c1
@@ -456,6 +466,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -471,6 +482,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	2
 auto_increment_offset	10
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
 ERROR HY000: Failed to read auto-increment value from storage engine
 SELECT * FROM t1;
@@ -484,6 +496,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -499,6 +512,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	5
 auto_increment_offset	7
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (NULL),(NULL), (NULL);
 ERROR HY000: Failed to read auto-increment value from storage engine
 SELECT * FROM t1;
@@ -512,6 +526,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -531,6 +546,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	3
 auto_increment_offset	3
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (NULL),(NULL), (NULL);
 SELECT * FROM t1;
 c1
@@ -548,6 +564,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -566,6 +583,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	65535
 auto_increment_offset	65535
+wsrep_auto_increment_control	ON
 INSERT INTO t1 VALUES (NULL),(NULL);
 ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT * FROM t1;
@@ -579,6 +597,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 CREATE TABLE t1 (c1 DOUBLE NOT NULL AUTO_INCREMENT, c2 INT, PRIMARY KEY (c1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(NULL, 1);
 INSERT INTO t1 VALUES(NULL, 2);
@@ -866,6 +885,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	1
+wsrep_auto_increment_control	ON
 CREATE TABLE t1 (c1 TINYINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1, NULL);
 INSERT INTO t1 VALUES (-1, 'innodb');
@@ -1256,6 +1276,7 @@ SHOW VARIABLES LIKE "%auto_inc%";
 Variable_name	Value
 auto_increment_increment	1
 auto_increment_offset	256
+wsrep_auto_increment_control	ON
 CREATE TABLE t1 (c1 TINYINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1, NULL);
 SHOW CREATE TABLE t1;

mysql-test/suite/perfschema/r/all_instances.result

@@ -68,6 +68,12 @@ wait/synch/mutex/sql/LOCK_thread_count
 wait/synch/mutex/sql/LOCK_user_conn
 wait/synch/mutex/sql/LOCK_user_locks
 wait/synch/mutex/sql/LOCK_uuid_short_generator
+wait/synch/mutex/sql/LOCK_wsrep_ready
+wait/synch/mutex/sql/LOCK_wsrep_replaying
+wait/synch/mutex/sql/LOCK_wsrep_rollback
+wait/synch/mutex/sql/LOCK_wsrep_slave_threads
+wait/synch/mutex/sql/LOCK_wsrep_sst
+wait/synch/mutex/sql/LOCK_wsrep_sst_init
 wait/synch/mutex/sql/LOCK_xid_cache
 wait/synch/mutex/sql/LOG::LOCK_log
 wait/synch/mutex/sql/LOG_INFO::lock
@@ -87,6 +93,7 @@ wait/synch/mutex/sql/Slave_reporting_capability::err_lock
 wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data
 wait/synch/mutex/sql/THD::LOCK_thd_data
 wait/synch/mutex/sql/THD::LOCK_wakeup_ready
+wait/synch/mutex/sql/THD::LOCK_wsrep_thd
 wait/synch/mutex/sql/tz_LOCK
 select name from rwlock_instances
 where name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock")
@@ -122,6 +129,11 @@ wait/synch/cond/sql/COND_rpl_status
 wait/synch/cond/sql/COND_server_started
 wait/synch/cond/sql/COND_thread_cache
 wait/synch/cond/sql/COND_thread_count
+wait/synch/cond/sql/COND_wsrep_ready
+wait/synch/cond/sql/COND_wsrep_replaying
+wait/synch/cond/sql/COND_wsrep_rollback
+wait/synch/cond/sql/COND_wsrep_sst
+wait/synch/cond/sql/COND_wsrep_sst_init
 wait/synch/cond/sql/Event_scheduler::COND_state
 wait/synch/cond/sql/Master_info::data_cond
 wait/synch/cond/sql/Master_info::sleep_cond
@@ -139,6 +151,7 @@ wait/synch/cond/sql/Relay_log_info::sleep_cond
 wait/synch/cond/sql/Relay_log_info::start_cond
 wait/synch/cond/sql/Relay_log_info::stop_cond
 wait/synch/cond/sql/THD::COND_wakeup_ready
+wait/synch/cond/sql/THD::COND_wsrep_thd
 select event_name from file_instances group by event_name;
 event_name
 wait/io/file/aria/control

mysql-test/suite/perfschema/r/dml_setup_instruments.result

@@ -43,9 +43,9 @@ wait/synch/cond/sql/COND_rpl_status	YES	YES
 wait/synch/cond/sql/COND_server_started	YES	YES
 wait/synch/cond/sql/COND_thread_cache	YES	YES
 wait/synch/cond/sql/COND_thread_count	YES	YES
-wait/synch/cond/sql/Delayed_insert::cond	YES	YES
-wait/synch/cond/sql/Delayed_insert::cond_client	YES	YES
-wait/synch/cond/sql/Event_scheduler::COND_state	YES	YES
+wait/synch/cond/sql/COND_wsrep_ready	YES	YES
+wait/synch/cond/sql/COND_wsrep_replaying	YES	YES
+wait/synch/cond/sql/COND_wsrep_rollback	YES	YES
 select * from performance_schema.setup_instruments
 where name='Wait';
 select * from performance_schema.setup_instruments

mysql-test/suite/sys_vars/r/all_vars.result

@@ -10,5 +10,39 @@ there should be *no* long test name listed below:
 select distinct variable_name as `there should be *no* variables listed below:` from t2
 left join t1 on variable_name=test_name where test_name is null;
 there should be *no* variables listed below:
+innodb_disallow_writes
+wsrep_auto_increment_control
+wsrep_causal_reads
+wsrep_certify_nonpk
+wsrep_cluster_address
+wsrep_cluster_name
+wsrep_convert_lock_to_trx
+wsrep_data_home_dir
+wsrep_dbug_option
+wsrep_debug
+wsrep_drupal_282555_workaround
+wsrep_forced_binlog_format
+wsrep_log_conflicts
+wsrep_max_ws_rows
+wsrep_max_ws_size
+wsrep_mysql_replication_bundle
+wsrep_node_address
+wsrep_node_incoming_address
+wsrep_node_name
+wsrep_notify_cmd
+wsrep_on
+wsrep_osu_method
+wsrep_provider
+wsrep_provider_options
+wsrep_recover
+wsrep_replicate_myisam
+wsrep_retry_autocommit
+wsrep_slave_threads
+wsrep_sst_auth
+wsrep_sst_donor
+wsrep_sst_donor_rejects_queries
+wsrep_sst_method
+wsrep_sst_receive_address
+wsrep_start_position
 drop table t1;
 drop table t2;

mysql-test/t/information_schema.test

@@ -1336,28 +1336,8 @@ explain select count(*) from information_schema.views;
 #
 # Bug#39955 SELECT on INFORMATION_SCHEMA.GLOBAL_VARIABLES takes too long
 #
-set global init_connect="drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;\
-drop table if exists t1;drop table if exists t1;";
-select * from information_schema.global_variables where variable_name='init_connect';
+set global init_connect=repeat("drop table if exists t1;", 100);
+select length(@@global.init_connect), length(variable_value) from information_schema.global_variables where variable_name='init_connect';
 set global init_connect="";
 
 #

mysql-test/t/mysqld--help.test

@@ -10,7 +10,7 @@
 # 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;
+exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt;
 
 # The inline perl code below will copy $MYSQL_TMP_DIR/mysqld--help.txt
 # to output, but filter away some variable stuff (e.g. paths).