~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix : contents of mysql-test.diff at revision 125

~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix : (revision 125)

96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	1	diff -ruN a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
	2	--- a/mysql-test/include/default_mysqld.cnf 2011-04-09 18:48:03.000000000 +0400
	3	+++ b/mysql-test/include/default_mysqld.cnf 2011-04-09 18:49:05.000000000 +0400
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	4	@@ -29,7 +29,7 @@
	5	max_heap_table_size= 1M
	6
	7	loose-innodb_data_file_path= ibdata1:10M:autoextend
	8	-loose-innodb_buffer_pool_size= 8M
	9	+loose-innodb_buffer_pool_size= 32M
	10	loose-innodb_write_io_threads= 2
	11	loose-innodb_read_io_threads= 2
	12	loose-innodb_log_buffer_size= 1M
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	13	diff -ruN a/mysql-test/r/connect.result b/mysql-test/r/connect.result
	14	--- a/mysql-test/r/connect.result 2011-04-09 18:48:03.000000000 +0400
	15	+++ b/mysql-test/r/connect.result 2011-04-09 18:49:05.000000000 +0400
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	16	@@ -1,3 +1,4 @@
	17	+set global log_warnings=0;
	18	drop table if exists t1,t2;
	19	show tables;
	20	Tables_in_mysql
	21	@@ -221,3 +222,4 @@
	22	# ------------------------------------------------------------------
	23	# -- End of 5.1 tests
	24	# ------------------------------------------------------------------
	25	+set global log_warnings=1;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	26	diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result
	27	--- a/mysql-test/r/create.result 2011-04-09 18:48:03.000000000 +0400
	28	+++ b/mysql-test/r/create.result 2011-04-09 18:49:05.000000000 +0400
88.1.1 by Oleg Tsarev Add counters into SHOW PROCESSLIST for Rows_examined, Rows_sent, Rows_read	29	@@ -1741,7 +1741,11 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	30	`COMMAND` varchar(16) NOT NULL DEFAULT '',
	31	`TIME` int(7) NOT NULL DEFAULT '0',
	32	`STATE` varchar(64) DEFAULT NULL,
	33	- `INFO` longtext
	34	+ `INFO` longtext,
88.1.1 by Oleg Tsarev Add counters into SHOW PROCESSLIST for Rows_examined, Rows_sent, Rows_read	35	+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
	36	+ `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
	37	+ `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0',
	38	+ `ROWS_READ` bigint(21) unsigned NOT NULL DEFAULT '0'
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	39	) ENGINE=MyISAM DEFAULT CHARSET=utf8
	40	drop table t1;
	41	create temporary table t1 like information_schema.processlist;
91 by Oleg Tsarev Port Oleg and Alexey patches to 5.5.10	42	@@ -1755,7 +1759,11 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	43	`COMMAND` varchar(16) NOT NULL DEFAULT '',
	44	`TIME` int(7) NOT NULL DEFAULT '0',
	45	`STATE` varchar(64) DEFAULT NULL,
	46	- `INFO` longtext
	47	+ `INFO` longtext,
88.1.1 by Oleg Tsarev Add counters into SHOW PROCESSLIST for Rows_examined, Rows_sent, Rows_read	48	+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
	49	+ `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
	50	+ `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0',
	51	+ `ROWS_READ` bigint(21) unsigned NOT NULL DEFAULT '0'
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	52	) ENGINE=MyISAM DEFAULT CHARSET=utf8
	53	drop table t1;
	54	create table t1 like information_schema.character_sets;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	55	diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
	56	--- a/mysql-test/r/information_schema.result 2011-04-09 18:48:03.000000000 +0400
	57	+++ b/mysql-test/r/information_schema.result 2011-04-09 18:49:05.000000000 +0400
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	58	@@ -46,14 +46,17 @@
	59	select * from v1;
	60	c
	61	CHARACTER_SETS
	62	+CLIENT_STATISTICS
	63	COLLATIONS
	64	COLLATION_CHARACTER_SET_APPLICABILITY
	65	COLUMNS
	66	COLUMN_PRIVILEGES
	67	+INDEX_STATISTICS
	68	ENGINES
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	69	EVENTS
	70	FILES
	71	GLOBAL_STATUS
	72	+GLOBAL_TEMPORARY_TABLES
	73	GLOBAL_VARIABLES
	74	KEY_COLUMN_USAGE
	75	PARAMETERS
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	76	@@ -63,6 +66,7 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	77	PROFILING
	78	REFERENTIAL_CONSTRAINTS
	79	ROUTINES
	80	+QUERY_RESPONSE_TIME
	81	SCHEMATA
	82	SCHEMA_PRIVILEGES
	83	SESSION_STATUS
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	84	@@ -72,9 +76,14 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	85	TABLESPACES
	86	TABLE_CONSTRAINTS
	87	TABLE_PRIVILEGES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	88	+TABLE_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	89	+TEMPORARY_TABLES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	90	+THREAD_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	91	TRIGGERS
	92	USER_PRIVILEGES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	93	+USER_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	94	VIEWS
	95	+XTRADB_ADMIN_COMMAND
	96	columns_priv
	97	db
	98	event
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	99	@@ -112,6 +121,9 @@
	100	TABLESPACES TABLESPACES
	101	TABLE_CONSTRAINTS TABLE_CONSTRAINTS
	102	TABLE_PRIVILEGES TABLE_PRIVILEGES
	103	+TABLE_STATISTICS TABLE_STATISTICS
	104	+TEMPORARY_TABLES TEMPORARY_TABLES
	105	+THREAD_STATISTICS THREAD_STATISTICS
	106	TRIGGERS TRIGGERS
	107	tables_priv tables_priv
	108	time_zone time_zone
	109	@@ -132,6 +144,9 @@
	110	TABLESPACES TABLESPACES
	111	TABLE_CONSTRAINTS TABLE_CONSTRAINTS
	112	TABLE_PRIVILEGES TABLE_PRIVILEGES
	113	+TABLE_STATISTICS TABLE_STATISTICS
	114	+TEMPORARY_TABLES TEMPORARY_TABLES
	115	+THREAD_STATISTICS THREAD_STATISTICS
	116	TRIGGERS TRIGGERS
	117	tables_priv tables_priv
	118	time_zone time_zone
	119	@@ -152,6 +167,9 @@
	120	TABLESPACES TABLESPACES
	121	TABLE_CONSTRAINTS TABLE_CONSTRAINTS
	122	TABLE_PRIVILEGES TABLE_PRIVILEGES
	123	+TABLE_STATISTICS TABLE_STATISTICS
	124	+TEMPORARY_TABLES TEMPORARY_TABLES
	125	+THREAD_STATISTICS THREAD_STATISTICS
	126	TRIGGERS TRIGGERS
	127	tables_priv tables_priv
	128	time_zone time_zone
	129	@@ -634,13 +652,16 @@
	130	where table_schema='information_schema' limit 2;
	131	TABLE_NAME TABLE_TYPE ENGINE
	132	CHARACTER_SETS SYSTEM VIEW MEMORY
	133	-COLLATIONS SYSTEM VIEW MEMORY
	134	+CLIENT_STATISTICS SYSTEM VIEW MEMORY
	135	show tables from information_schema like "T%";
	136	Tables_in_information_schema (T%)
	137	TABLES
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	138	TABLESPACES
	139	TABLE_CONSTRAINTS
	140	TABLE_PRIVILEGES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	141	+TABLE_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	142	+TEMPORARY_TABLES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	143	+THREAD_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	144	TRIGGERS
	145	create database information_schema;
	146	ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	147	@@ -651,6 +672,9 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	148	TABLESPACES SYSTEM VIEW
	149	TABLE_CONSTRAINTS SYSTEM VIEW
	150	TABLE_PRIVILEGES SYSTEM VIEW
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	151	+TABLE_STATISTICS SYSTEM VIEW
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	152	+TEMPORARY_TABLES SYSTEM VIEW
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	153	+THREAD_STATISTICS SYSTEM VIEW
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	154	TRIGGERS SYSTEM VIEW
	155	create table t1(a int);
	156	ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	157	@@ -664,6 +688,9 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	158	TABLESPACES
	159	TABLE_CONSTRAINTS
	160	TABLE_PRIVILEGES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	161	+TABLE_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	162	+TEMPORARY_TABLES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	163	+THREAD_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	164	TRIGGERS
	165	select table_name from tables where table_name='user';
	166	table_name
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	167	@@ -806,6 +833,8 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	168	FILES CREATE_TIME datetime
	169	FILES UPDATE_TIME datetime
	170	FILES CHECK_TIME datetime
	171	+GLOBAL_TEMPORARY_TABLES CREATE_TIME datetime
	172	+GLOBAL_TEMPORARY_TABLES UPDATE_TIME datetime
	173	PARTITIONS CREATE_TIME datetime
	174	PARTITIONS UPDATE_TIME datetime
	175	PARTITIONS CHECK_TIME datetime
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	176	@@ -814,6 +843,8 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	177	TABLES CREATE_TIME datetime
	178	TABLES UPDATE_TIME datetime
	179	TABLES CHECK_TIME datetime
	180	+TEMPORARY_TABLES CREATE_TIME datetime
	181	+TEMPORARY_TABLES UPDATE_TIME datetime
	182	TRIGGERS CREATED datetime
	183	event execute_at datetime
	184	event last_executed datetime
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	185	@@ -854,7 +885,9 @@
	186	TABLE_NAME COLUMN_NAME PRIVILEGES
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	187	COLUMNS TABLE_NAME select
	188	COLUMN_PRIVILEGES TABLE_NAME select
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	189	+INDEX_STATISTICS TABLE_NAME select
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	190	FILES TABLE_NAME select
	191	+GLOBAL_TEMPORARY_TABLES TABLE_NAME select
	192	KEY_COLUMN_USAGE TABLE_NAME select
	193	PARTITIONS TABLE_NAME select
	194	REFERENTIAL_CONSTRAINTS TABLE_NAME select
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	195	@@ -862,7 +895,11 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	196	TABLES TABLE_NAME select
	197	TABLE_CONSTRAINTS TABLE_NAME select
	198	TABLE_PRIVILEGES TABLE_NAME select
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	199	+TABLE_STATISTICS TABLE_NAME select
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	200	+TEMPORARY_TABLES TABLE_NAME select
	201	VIEWS TABLE_NAME select
	202	+INNODB_TABLE_STATS table_name select
	203	+INNODB_INDEX_STATS table_name select
	204	delete from mysql.user where user='mysqltest_4';
	205	delete from mysql.db where user='mysqltest_4';
	206	flush privileges;
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	207	@@ -871,7 +908,7 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	208	AND table_name not like 'ndb%' AND table_name not like 'innodb_%'
	209	GROUP BY TABLE_SCHEMA;
	210	table_schema count(*)
	211	-information_schema 30
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	212	+information_schema 39
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	213	mysql 23
	214	create table t1 (i int, j int);
	215	create trigger trg1 before insert on t1 for each row
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	216	@@ -1245,12 +1282,12 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	217	DROP USER mysql_bug20230@localhost;
	218	SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
	219	MAX(table_name)
	220	-VIEWS
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	221	+XTRADB_ADMIN_COMMAND
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	222	SELECT table_name from information_schema.tables
	223	WHERE table_name=(SELECT MAX(table_name)
	224	FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'));
	225	table_name
	226	-VIEWS
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	227	+XTRADB_ADMIN_COMMAND
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	228	DROP TABLE IF EXISTS bug23037;
	229	DROP FUNCTION IF EXISTS get_value;
	230	SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	231	@@ -1311,6 +1348,7 @@
	232	group by t.table_name order by num1, t.table_name;
	233	table_name group_concat(t.table_schema, '.', t.table_name) num1
	234	CHARACTER_SETS information_schema.CHARACTER_SETS 1
	235	+CLIENT_STATISTICS information_schema.CLIENT_STATISTICS 1
	236	COLLATIONS information_schema.COLLATIONS 1
	237	COLLATION_CHARACTER_SET_APPLICABILITY information_schema.COLLATION_CHARACTER_SET_APPLICABILITY 1
	238	COLUMNS information_schema.COLUMNS 1
	239	@@ -1319,13 +1357,16 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	240	EVENTS information_schema.EVENTS 1
	241	FILES information_schema.FILES 1
	242	GLOBAL_STATUS information_schema.GLOBAL_STATUS 1
	243	+GLOBAL_TEMPORARY_TABLES information_schema.GLOBAL_TEMPORARY_TABLES 1
	244	GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	245	+INDEX_STATISTICS information_schema.INDEX_STATISTICS 1
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	246	KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
	247	PARAMETERS information_schema.PARAMETERS 1
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	248	PARTITIONS information_schema.PARTITIONS 1
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	249	PLUGINS information_schema.PLUGINS 1
	250	PROCESSLIST information_schema.PROCESSLIST 1
	251	PROFILING information_schema.PROFILING 1
	252	+QUERY_RESPONSE_TIME information_schema.QUERY_RESPONSE_TIME 1
	253	REFERENTIAL_CONSTRAINTS information_schema.REFERENTIAL_CONSTRAINTS 1
	254	ROUTINES information_schema.ROUTINES 1
	255	SCHEMATA information_schema.SCHEMATA 1
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	256	@@ -1337,8 +1378,12 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	257	TABLESPACES information_schema.TABLESPACES 1
	258	TABLE_CONSTRAINTS information_schema.TABLE_CONSTRAINTS 1
	259	TABLE_PRIVILEGES information_schema.TABLE_PRIVILEGES 1
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	260	+TABLE_STATISTICS information_schema.TABLE_STATISTICS 1
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	261	+TEMPORARY_TABLES information_schema.TEMPORARY_TABLES 1
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	262	+THREAD_STATISTICS information_schema.THREAD_STATISTICS 1
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	263	TRIGGERS information_schema.TRIGGERS 1
	264	USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	265	+USER_STATISTICS information_schema.USER_STATISTICS 1
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	266	VIEWS information_schema.VIEWS 1
	267	create table t1(f1 int);
	268	create view v1 as select f1+1 as a from t1;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	269	diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
	270	--- a/mysql-test/r/information_schema_db.result 2011-04-09 18:48:03.000000000 +0400
	271	+++ b/mysql-test/r/information_schema_db.result 2011-04-09 18:49:05.000000000 +0400
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	272	@@ -6,14 +6,17 @@
	273	show tables where Tables_in_information_schema NOT LIKE 'Innodb%';
	274	Tables_in_information_schema
	275	CHARACTER_SETS
	276	+CLIENT_STATISTICS
	277	COLLATIONS
	278	COLLATION_CHARACTER_SET_APPLICABILITY
	279	COLUMNS
	280	COLUMN_PRIVILEGES
	281	+INDEX_STATISTICS
	282	ENGINES
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	283	EVENTS
	284	FILES
	285	GLOBAL_STATUS
	286	+GLOBAL_TEMPORARY_TABLES
	287	GLOBAL_VARIABLES
	288	KEY_COLUMN_USAGE
	289	PARAMETERS
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	290	@@ -23,6 +26,7 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	291	PROFILING
	292	REFERENTIAL_CONSTRAINTS
	293	ROUTINES
	294	+QUERY_RESPONSE_TIME
	295	SCHEMATA
	296	SCHEMA_PRIVILEGES
	297	SESSION_STATUS
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	298	@@ -32,15 +36,23 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	299	TABLESPACES
	300	TABLE_CONSTRAINTS
	301	TABLE_PRIVILEGES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	302	+TABLE_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	303	+TEMPORARY_TABLES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	304	+THREAD_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	305	TRIGGERS
	306	USER_PRIVILEGES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	307	+USER_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	308	VIEWS
	309	+XTRADB_ADMIN_COMMAND
	310	show tables from INFORMATION_SCHEMA like 'T%';
	311	Tables_in_information_schema (T%)
	312	TABLES
	313	TABLESPACES
	314	TABLE_CONSTRAINTS
	315	TABLE_PRIVILEGES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	316	+TABLE_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	317	+TEMPORARY_TABLES
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	318	+THREAD_STATISTICS
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	319	TRIGGERS
	320	create database `inf%`;
	321	create database mbase;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	322	diff -ruN a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
	323	--- a/mysql-test/r/mysqld--help-notwin.result 2011-04-09 18:48:03.000000000 +0400
	324	+++ b/mysql-test/r/mysqld--help-notwin.result 2011-04-09 18:49:05.000000000 +0400
91.1.1 by Ignacio Nin Test result text changes	325	@@ -250,21 +250,40 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	326	--log-slow-admin-statements
	327	Log slow OPTIMIZE, ANALYZE, ALTER and other
	328	administrative statements to the slow log if it is open.
	329	+ --log-slow-filter=name
	330	+ Log only the queries that followed certain execution
	331	+ plan. Multiple flags allowed in a comma-separated string.
	332	+ [qc_miss, full_scan, full_join, tmp_table,
	333	+ tmp_table_on_disk, filesort, filesort_on_disk]
	334	--log-slow-queries[=name]
	335	Log slow queries to a table or log file. Defaults logging
	336	to table mysql.slow_log or hostname-slow.log if
	337	--log-output=file is used. Must be enabled to activate
	338	other slow log options. Deprecated option, use
	339	--slow-query-log/--slow-query-log-file instead.
	340	+ --log-slow-rate-limit=#
	341	+ Rate limit statement writes to slow log to only those
	342	+ from every (1/log_slow_rate_limit) session.
	343	--log-slow-slave-statements
	344	- Log slow statements executed by slave thread to the slow
	345	- log if it is open.
	346	+ Log queries replayed be the slave SQL thread
	347	+ --log-slow-sp-statements
	348	+ Log slow statements executed by stored procedure to the
	349	+ slow log if it is open.
	350	+ (Defaults to on; use --skip-log-slow-sp-statements to disable.)
	351	+ --log-slow-verbosity=name
	352	+ Choose how verbose the messages to your slow log will be.
	353	+ Multiple flags allowed in a comma-separated string.
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	354	+ [microtime, query_plan, innodb, profiling,
75 by Oleg Tsarev update tests result of sys_vars.all_vars (missed merge profiling_slow to slow_extended, missed rename enable_query_response_time_stats)	355	+ profiling_use_getrusage]
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	356	--log-tc=name Path to transaction coordinator log (used for
	357	transactions that affect more than one storage engine,
	358	when binary log is disabled).
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	359	--log-tc-size=# Size of transaction coordinator log.
	360	-W, --log-warnings[=#]
	361	Log some not critical warnings to the log file
91.1.1 by Ignacio Nin Test result text changes	362	+ --log-warnings-suppress=name
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	363	+ disable logging of enumerated warnings: 1592: unsafe
	364	+ statements for binary logging; possible values : [1592]
	365	--long-query-time=# Log all queries that have taken more than long_query_time
	366	seconds to execute to file. The argument will be treated
	367	as a decimal value with microsecond precision
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	368	@@ -475,6 +494,10 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	369	The minimum size for blocks allocated by the query cache
	370	--query-cache-size=#
	371	The memory allocated to store results from old queries
	372	+ --query-cache-strip-comments
	373	+ Enable and disable optimisation "strip comment for query
	374	+ cache" - optimisation strip all comments from query while
	375	+ search query result in query cache
	376	--query-cache-type=name
	377	OFF = Don't cache or retrieve results. ON = Cache all
	378	results except SELECT SQL_NO_CACHE ... queries. DEMAND =
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	379	@@ -483,6 +506,12 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	380	Invalidate queries in query cache on LOCK for write
	381	--query-prealloc-size=#
	382	Persistent buffer for query parsing and execution
	383	+ --query-response-time-range-base=#
	384	+ Select base of log for query_response_time ranges.
	385	+ WARNING: variable change affect only after flush
75 by Oleg Tsarev update tests result of sys_vars.all_vars (missed merge profiling_slow to slow_extended, missed rename enable_query_response_time_stats)	386	+ --query-response-time-stats
	387	+ Enable or disable query response time statisics
	388	+ collecting
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	389	--range-alloc-block-size=#
	390	Allocation block size for storing ranges during
	391	optimization
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	392	@@ -660,6 +689,18 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	393	Log slow queries to given log file. Defaults logging to
	394	hostname-slow.log. Must be enabled to activate other slow
	395	log options
91.1.1 by Ignacio Nin Test result text changes	396	+ --slow-query-log-timestamp-always
	397	+ Timestamp is printed for all records of the slow log even
	398	+ if they are same time.
	399	+ --slow-query-log-timestamp-precision=name
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	400	+ Log slow statements executed by stored procedure to the
91.1.1 by Ignacio Nin Test result text changes	401	+ slow log if it is open. [second, microsecond]
	402	+ --slow-query-log-use-global-control=name
	403	+ Choose flags, wich always use the global variables.
	404	+ Multiple flags allowed in a comma-separated string.
	405	+ [none, log_slow_filter, log_slow_rate_limit,
	406	+ log_slow_verbosity, long_query_time,
	407	+ min_examined_row_limit, all]
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	408	--socket=name Socket file to use for connection
	409	--sort-buffer-size=#
	410	Each thread that needs to do a sort allocates a buffer of
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	411	@@ -702,6 +743,8 @@
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	412	Define threads usage for handling queries, one of
	413	one-thread-per-connection, no-threads, loaded-dynamically
	414	--thread-stack=# The stack size for each thread
91.1.1 by Ignacio Nin Test result text changes	415	+ --thread-statistics Control TABLE_STATISTICS running, when userstat is
91.1.1 by Ignacio Nin Test result text changes	416	+ enabled
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	417	--time-format=name The TIME format (ignored)
	418	--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
	419	currently supported)
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	420	@@ -727,10 +770,17 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	421	of the underlying table and the query uses a LIMIT clause
	422	(usually get from GUI tools)
	423	-u, --user=name Run mysqld daemon as user.
91.1.1 by Ignacio Nin Test result text changes	424	+ --userstat Control USER_STATISTICS, CLIENT_STATISTICS,
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	425	+ THREAD_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS
	426	+ running
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	427	-v, --verbose Used with --help option for detailed help.
	428	-V, --version Output version information and exit.
	429	--wait-timeout=# The number of seconds the server waits for activity on a
	430	connection before closing it
	431	+ --xtradb-admin-command[=name]
	432	+ Enable or disable XTRADB_ADMIN_COMMAND plugin. Possible
	433	+ values are ON, OFF, FORCE (don't start if the plugin
	434	+ fails to load).
	435
	436	Variables (--variable-name=value)
	437	abort-slave-event-count 0
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	438	@@ -813,10 +863,15 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	439	log-short-format FALSE
	440	log-slave-updates FALSE
	441	log-slow-admin-statements FALSE
	442	+log-slow-filter
	443	+log-slow-rate-limit 1
	444	log-slow-slave-statements FALSE
	445	+log-slow-sp-statements TRUE
	446	+log-slow-verbosity
	447	log-tc tc.log
	448	log-tc-size 24576
	449	log-warnings 1
91.1.1 by Ignacio Nin Test result text changes	450	+log-warnings-suppress
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	451	long-query-time 10
	452	low-priority-updates FALSE
	453	lower-case-table-names 1
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	454	@@ -892,9 +947,12 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	455	query-cache-limit 1048576
	456	query-cache-min-res-unit 4096
	457	query-cache-size 0
	458	+query-cache-strip-comments FALSE
	459	query-cache-type ON
	460	query-cache-wlock-invalidate FALSE
	461	query-prealloc-size 8192
	462	+query-response-time-range-base 10
75 by Oleg Tsarev update tests result of sys_vars.all_vars (missed merge profiling_slow to slow_extended, missed rename enable_query_response_time_stats)	463	+query-response-time-stats FALSE
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	464	range-alloc-block-size 4096
	465	read-buffer-size 131072
	466	read-only FALSE
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	467	@@ -929,6 +987,9 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	468	slave-type-conversions
	469	slow-launch-time 2
	470	slow-query-log FALSE
91.1.1 by Ignacio Nin Test result text changes	471	+slow-query-log-timestamp-always FALSE
	472	+slow-query-log-timestamp-precision second
	473	+slow-query-log-use-global-control
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	474	sort-buffer-size 2097152
	475	sporadic-binlog-dump-fail FALSE
	476	sql-mode
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	477	@@ -946,6 +1007,7 @@
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	478	thread-cache-size 0
	479	thread-handling one-thread-per-connection
	480	thread-stack 262144
	481	+thread-statistics FALSE
	482	time-format %H:%i:%s
	483	timed-mutexes FALSE
	484	tmp-table-size 16777216
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	485	@@ -953,8 +1015,10 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	486	transaction-isolation REPEATABLE-READ
	487	transaction-prealloc-size 4096
	488	updatable-views-with-limit YES
91.1.1 by Ignacio Nin Test result text changes	489	+userstat FALSE
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	490	verbose TRUE
	491	wait-timeout 28800
	492	+xtradb-admin-command ON
	493
	494	To see what values a running MySQL server is using, type
	495	'mysqladmin variables' instead of 'mysqld --verbose --help'.
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	496	diff -ruN a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
	497	--- a/mysql-test/r/mysqldump.result 2011-04-09 18:48:03.000000000 +0400
	498	+++ b/mysql-test/r/mysqldump.result 2011-04-09 18:49:05.000000000 +0400
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	499	@@ -1832,7 +1832,7 @@
	500	# Bug#21288 mysqldump segmentation fault when using --where
	501	#
	502	create table t1 (a int);
	503	-mysqldump: Couldn't execute 'SELECT /!40001 SQL_NO_CACHE / * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
	504	+mysqldump: Couldn't execute 'SELECT /!40001 SQL_NO_CACHE / /!50084 SQL_NO_FCACHE / * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
	505	mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server
	506
	507	/!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT /;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	508	diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
	509	--- a/mysql-test/r/mysqlshow.result 2011-04-09 18:48:03.000000000 +0400
	510	+++ b/mysql-test/r/mysqlshow.result 2011-04-09 18:49:05.000000000 +0400
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	511	@@ -80,14 +80,17 @@
	512	\| Tables \|
	513	+---------------------------------------+
	514	\| CHARACTER_SETS \|
	515	+\| CLIENT_STATISTICS \|
	516	\| COLLATIONS \|
	517	\| COLLATION_CHARACTER_SET_APPLICABILITY \|
	518	\| COLUMNS \|
	519	\| COLUMN_PRIVILEGES \|
	520	+\| INDEX_STATISTICS \|
	521	\| ENGINES \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	522	\| EVENTS \|
	523	\| FILES \|
	524	\| GLOBAL_STATUS \|
	525	+\| GLOBAL_TEMPORARY_TABLES \|
	526	\| GLOBAL_VARIABLES \|
	527	\| KEY_COLUMN_USAGE \|
	528	\| PARAMETERS \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	529	@@ -97,6 +100,7 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	530	\| PROFILING \|
	531	\| REFERENTIAL_CONSTRAINTS \|
	532	\| ROUTINES \|
	533	+\| QUERY_RESPONSE_TIME \|
	534	\| SCHEMATA \|
	535	\| SCHEMA_PRIVILEGES \|
	536	\| SESSION_STATUS \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	537	@@ -106,30 +110,52 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	538	\| TABLESPACES \|
	539	\| TABLE_CONSTRAINTS \|
	540	\| TABLE_PRIVILEGES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	541	+\| TABLE_STATISTICS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	542	+\| TEMPORARY_TABLES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	543	+\| THREAD_STATISTICS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	544	\| TRIGGERS \|
	545	\| USER_PRIVILEGES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	546	+\| USER_STATISTICS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	547	\| VIEWS \|
	548	-\| INNODB_CMP_RESET \|
	549	+\| INNODB_SYS_COLUMNS \|
	550	+\| INNODB_RSEG \|
	551	+\| INNODB_CMP \|
	552	\| INNODB_TRX \|
	553	-\| INNODB_CMPMEM_RESET \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	554	+\| INNODB_SYS_TABLESTATS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	555	\| INNODB_LOCK_WAITS \|
	556	-\| INNODB_CMPMEM \|
	557	-\| INNODB_CMP \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	558	+\| XTRADB_ADMIN_COMMAND \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	559	\| INNODB_LOCKS \|
	560	+\| INNODB_SYS_FOREIGN_COLS \|
	561	+\| INNODB_CMP_RESET \|
	562	+\| INNODB_BUFFER_POOL_PAGES \|
	563	+\| INNODB_SYS_TABLES \|
	564	+\| INNODB_BUFFER_POOL_PAGES_INDEX \|
	565	+\| INNODB_CMPMEM \|
	566	+\| INNODB_BUFFER_POOL_PAGES_BLOB \|
	567	+\| INNODB_CMPMEM_RESET \|
	568	+\| INNODB_SYS_FIELDS \|
	569	+\| INNODB_TABLE_STATS \|
	570	+\| INNODB_SYS_STATS \|
	571	+\| INNODB_SYS_FOREIGN \|
	572	+\| INNODB_SYS_INDEXES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	573	+\| INNODB_INDEX_STATS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	574	+---------------------------------------+
	575	Database: INFORMATION_SCHEMA
	576	+---------------------------------------+
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	577	\| Tables \|
	578	+---------------------------------------+
	579	\| CHARACTER_SETS \|
	580	+\| CLIENT_STATISTICS \|
	581	\| COLLATIONS \|
	582	\| COLLATION_CHARACTER_SET_APPLICABILITY \|
	583	\| COLUMNS \|
	584	\| COLUMN_PRIVILEGES \|
	585	+\| INDEX_STATISTICS \|
	586	\| ENGINES \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	587	\| EVENTS \|
	588	\| FILES \|
	589	\| GLOBAL_STATUS \|
	590	+\| GLOBAL_TEMPORARY_TABLES \|
	591	\| GLOBAL_VARIABLES \|
	592	\| KEY_COLUMN_USAGE \|
	593	\| PARAMETERS \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	594	@@ -139,6 +165,7 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	595	\| PROFILING \|
	596	\| REFERENTIAL_CONSTRAINTS \|
	597	\| ROUTINES \|
	598	+\| QUERY_RESPONSE_TIME \|
	599	\| SCHEMATA \|
	600	\| SCHEMA_PRIVILEGES \|
	601	\| SESSION_STATUS \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	602	@@ -148,16 +175,35 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	603	\| TABLESPACES \|
	604	\| TABLE_CONSTRAINTS \|
	605	\| TABLE_PRIVILEGES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	606	+\| TABLE_STATISTICS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	607	+\| TEMPORARY_TABLES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	608	+\| THREAD_STATISTICS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	609	\| TRIGGERS \|
	610	\| USER_PRIVILEGES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	611	+\| USER_STATISTICS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	612	\| VIEWS \|
	613	-\| INNODB_CMP_RESET \|
	614	+\| INNODB_SYS_COLUMNS \|
	615	+\| INNODB_RSEG \|
	616	+\| INNODB_CMP \|
	617	\| INNODB_TRX \|
	618	-\| INNODB_CMPMEM_RESET \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	619	+\| INNODB_SYS_TABLESTATS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	620	\| INNODB_LOCK_WAITS \|
	621	-\| INNODB_CMPMEM \|
	622	-\| INNODB_CMP \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	623	+\| XTRADB_ADMIN_COMMAND \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	624	\| INNODB_LOCKS \|
	625	+\| INNODB_SYS_FOREIGN_COLS \|
	626	+\| INNODB_CMP_RESET \|
	627	+\| INNODB_BUFFER_POOL_PAGES \|
	628	+\| INNODB_SYS_TABLES \|
	629	+\| INNODB_BUFFER_POOL_PAGES_INDEX \|
	630	+\| INNODB_CMPMEM \|
	631	+\| INNODB_BUFFER_POOL_PAGES_BLOB \|
	632	+\| INNODB_CMPMEM_RESET \|
	633	+\| INNODB_SYS_FIELDS \|
	634	+\| INNODB_TABLE_STATS \|
	635	+\| INNODB_SYS_STATS \|
	636	+\| INNODB_SYS_FOREIGN \|
	637	+\| INNODB_SYS_INDEXES \|
41 by Oleg Tsarev Remove unnecessary test percona_suppress_log_warning_1592 (this test should be renamed to log_warnings_silence)	638	+\| INNODB_INDEX_STATS \|
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	639	+---------------------------------------+
	640	Wildcard: inf_rmation_schema
	641	+--------------------+
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	642	diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result
	643	--- a/mysql-test/r/select.result 2011-04-09 18:48:03.000000000 +0400
	644	+++ b/mysql-test/r/select.result 2011-04-09 18:49:05.000000000 +0400
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	645	@@ -2196,10 +2196,10 @@
	646	select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
	647	a a
	648	1 2
	649	-2 2
	650	-3 2
	651	1 3
	652	+2 2
	653	2 3
	654	+3 2
	655	3 3
	656	select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
	657	a a
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	658	diff -ruN a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
	659	--- a/mysql-test/r/show_check.result 2011-04-09 18:48:03.000000000 +0400
	660	+++ b/mysql-test/r/show_check.result 2011-04-09 18:49:05.000000000 +0400
109.1.1 by Oleg Tsarev port to 5.5.12 second part	661	@@ -1538,14 +1538,14 @@
91.1.1 by Ignacio Nin Test result text changes	662	SET NAMES latin1;
	663	SELECT GET_LOCK('t',1000) AS 'óóóó';;
	664	SHOW PROCESSLIST;
	665	-Id User Host db Command Time State Info
	666	-### root ### test Query ### ### SHOW PROCESSLIST
	667	-### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
	668	+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
	669	+### root ### test Query ### ### SHOW PROCESSLIST ### ### ###
	670	+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ###
	671	SET NAMES utf8;
	672	SHOW PROCESSLIST;
	673	-Id User Host db Command Time State Info
	674	-### root ### test Query ### ### SHOW PROCESSLIST
	675	-### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'Ã³Ã³Ã³Ã³'
	676	+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
	677	+### root ### test Query ### ### SHOW PROCESSLIST ### ### ###
	678	+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'Ã³Ã³Ã³Ã³' ### ### ###
	679	SELECT RELEASE_LOCK('t');
	680	RELEASE_LOCK('t')
	681	1
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	682	diff -ruN a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result
	683	--- a/mysql-test/r/sp-threads.result 2011-04-09 18:48:03.000000000 +0400
	684	+++ b/mysql-test/r/sp-threads.result 2011-04-09 18:49:05.000000000 +0400
91.1.1 by Ignacio Nin Test result text changes	685	@@ -33,11 +33,11 @@
	686	lock tables t2 write;
	687	call bug9486();
	688	show processlist;
	689	-Id User Host db Command Time State Info
	690	-# root localhost test Sleep # NULL
	691	-# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2
	692	-# root localhost test Query # NULL show processlist
	693	-# root localhost test Sleep # NULL
	694	+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
	695	+# root localhost test Sleep # NULL # # #
	696	+# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 # # #
	697	+# root localhost test Query # NULL show processlist # # #
	698	+# root localhost test Sleep # NULL # # #
	699	unlock tables;
	700	drop procedure bug9486;
	701	drop table t1, t2;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	702	diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
	703	--- a/mysql-test/suite/innodb/r/innodb.result 2011-04-09 18:49:04.000000000 +0400
	704	+++ b/mysql-test/suite/innodb/r/innodb.result 2011-04-09 18:49:05.000000000 +0400
69.1.1 by Oleg Tsarev Port Oleg and Alexey patches to 5.5.9	705	@@ -1664,7 +1664,7 @@
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	706	drop table t1;
	707	SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
	708	variable_value
	709	-511
50 by kinoyasu adjust a little for mysql-test	710	+2047
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	711	SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
	712	variable_value
	713	16384
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	714	diff -ruN a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
	715	--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-04-09 18:48:03.000000000 +0400
	716	+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-04-09 18:49:05.000000000 +0400
80 by kinoyasu adjust for mysql-test: main.percona_innodb_doublewrite_file sys_vars.innodb_adaptive_flushing_basic sys_vars.innodb_flush_log_at_trx_commit_basic	717	@@ -10,7 +10,6 @@
	718	1
	719	'#---------------------FN_DYNVARS_046_02-------------------------#'
	720	SET innodb_flush_log_at_trx_commit = 1;
	721	-ERROR HY000: Variable 'innodb_flush_log_at_trx_commit' is a GLOBAL variable and should be set with SET GLOBAL
	722	SELECT @@innodb_flush_log_at_trx_commit;
	723	@@innodb_flush_log_at_trx_commit
	724	1
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	725	diff -ruN a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
	726	--- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-04-09 18:48:03.000000000 +0400
	727	+++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-04-09 18:49:05.000000000 +0400
80 by kinoyasu adjust for mysql-test: main.percona_innodb_doublewrite_file sys_vars.innodb_adaptive_flushing_basic sys_vars.innodb_flush_log_at_trx_commit_basic	728	@@ -56,7 +56,7 @@
	729	# Check if variable can be accessed with and without @@ sign #
	730	###############################################################################
	731
	732	---Error ER_GLOBAL_VARIABLE
	733	+#--Error ER_GLOBAL_VARIABLE
	734	SET innodb_flush_log_at_trx_commit = 1;
	735	SELECT @@innodb_flush_log_at_trx_commit;
	736
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	737	diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test
	738	--- a/mysql-test/t/connect.test 2011-04-09 18:48:03.000000000 +0400
	739	+++ b/mysql-test/t/connect.test 2011-04-09 18:49:05.000000000 +0400
13 by kinoyasu patches for existed mysql-test scripts are gathered to mysql-test.diff	740	@@ -1,3 +1,5 @@
	741	+set global log_warnings=0;
	742	+
	743	# This test is to check various cases of connections
	744	# with right and wrong password, with and without database
	745	# Unfortunately the check is incomplete as we can't connect without database
	746	@@ -300,3 +302,4 @@
	747	# Wait till all disconnects are completed
	748	--source include/wait_until_count_sessions.inc
	749
	750	+set global log_warnings=1;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	751	diff -ruN a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
	752	--- a/mysql-test/t/show_check.test 2011-04-09 18:48:03.000000000 +0400
	753	+++ b/mysql-test/t/show_check.test 2011-04-09 18:49:05.000000000 +0400
109.1.1 by Oleg Tsarev port to 5.5.12 second part	754	@@ -1376,10 +1376,10 @@
88.1.1 by Oleg Tsarev Add counters into SHOW PROCESSLIST for Rows_examined, Rows_sent, Rows_read	755	let $wait_timeout= 10;
	756	let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
	757	--source include/wait_condition.inc
	758	---replace_column 1 ### 3 ### 6 ### 7 ###
	759	+--replace_column 1 ### 3 ### 6 ### 7 ### 9 ### 10 ### 11 ###
	760	SHOW PROCESSLIST;
	761	SET NAMES utf8;
	762	---replace_column 1 ### 3 ### 6 ### 7 ###
	763	+--replace_column 1 ### 3 ### 6 ### 7 ### 9 ### 10 ### 11 ###
	764	SHOW PROCESSLIST;
	765	SELECT RELEASE_LOCK('t');
	766	--connection con1
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	767	diff -ruN a/mysql-test/t/sp-threads.test b/mysql-test/t/sp-threads.test
	768	--- a/mysql-test/t/sp-threads.test 2011-04-09 18:48:03.000000000 +0400
	769	+++ b/mysql-test/t/sp-threads.test 2011-04-09 18:49:05.000000000 +0400
88.1.1 by Oleg Tsarev Add counters into SHOW PROCESSLIST for Rows_examined, Rows_sent, Rows_read	770	@@ -81,7 +81,7 @@
	771	connection con2root;
	772	--sleep 2
	773	# There should be call statement in locked state.
	774	---replace_column 1 # 3 localhost 6 #
	775	+--replace_column 1 # 3 localhost 6 # 9 # 10 # 11 #
	776	show processlist;
	777	unlock tables;
	778	connection con1root;
96 by Alexey Kopytov Ported non-XtraDB patches to 5.5.11	779	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result
	780	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	781	+++ b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result 2011-04-09 18:49:05.000000000 +0400
	782	@@ -0,0 +1,3 @@
	783	+SELECT @@global.log_slow_sp_statements;
	784	+@@global.log_slow_sp_statements
	785	+1
	786	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test
	787	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	788	+++ b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test 2011-04-09 18:49:05.000000000 +0400
	789	@@ -0,0 +1 @@
	790	+SELECT @@global.log_slow_sp_statements;
	791	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result
	792	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	793	+++ b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result 2011-04-09 18:49:05.000000000 +0400
	794	@@ -0,0 +1,3 @@
	795	+SELECT @@global.fast_index_creation;
	796	+@@global.fast_index_creation
	797	+1
	798	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result
	799	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	800	+++ b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result 2011-04-09 18:49:05.000000000 +0400
	801	@@ -0,0 +1,3 @@
	802	+SELECT @@global.have_response_time_distribution;
	803	+@@global.have_response_time_distribution
	804	+YES
	805	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result
	806	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	807	+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result 2011-04-09 18:49:05.000000000 +0400
	808	@@ -0,0 +1,3 @@
	809	+SELECT @@global.innodb_adaptive_flushing_method;
	810	+@@global.innodb_adaptive_flushing_method
	811	+estimate
	812	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result
	813	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	814	+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result 2011-04-09 18:49:05.000000000 +0400
	815	@@ -0,0 +1,3 @@
	816	+SELECT @@global.innodb_adaptive_hash_index_partitions;
	817	+@@global.innodb_adaptive_hash_index_partitions
	818	+1
	819	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result
	820	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	821	+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result 2011-04-09 18:49:05.000000000 +0400
	822	@@ -0,0 +1,3 @@
	823	+SELECT @@global.innodb_buffer_pool_restore_at_startup;
	824	+@@global.innodb_buffer_pool_restore_at_startup
	825	+0
	826	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result
	827	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	828	+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result 2011-04-09 18:49:05.000000000 +0400
	829	@@ -0,0 +1,3 @@
	830	+SELECT @@global.innodb_buffer_pool_shm_checksum;
	831	+@@global.innodb_buffer_pool_shm_checksum
	832	+1
	833	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result
	834	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	835	+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result 2011-04-09 18:49:05.000000000 +0400
	836	@@ -0,0 +1,3 @@
	837	+SELECT @@global.innodb_buffer_pool_shm_key;
	838	+@@global.innodb_buffer_pool_shm_key
	839	+0
	840	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result
	841	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	842	+++ b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result 2011-04-09 18:49:05.000000000 +0400
843	@@ -0,0 +1,3 @@
844	+SELECT @@global.innodb_checkpoint_age_target;
845	+@@global.innodb_checkpoint_age_target
846	+0
847	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result
848	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
849	+++ b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result 2011-04-09 18:49:05.000000000 +0400
850	@@ -0,0 +1,3 @@
851	+SELECT @@global.innodb_corrupt_table_action;
852	+@@global.innodb_corrupt_table_action
853	+assert
854	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result
855	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
856	+++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result 2011-04-09 18:49:05.000000000 +0400
857	@@ -0,0 +1,3 @@
858	+SELECT @@global.innodb_dict_size_limit;
859	+@@global.innodb_dict_size_limit
860	+0
861	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result
862	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
863	+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result 2011-04-09 18:49:05.000000000 +0400
864	@@ -0,0 +1,3 @@
865	+SELECT @@global.innodb_doublewrite_file;
866	+@@global.innodb_doublewrite_file
867	+NULL
868	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result
869	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
870	+++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result 2011-04-09 18:49:05.000000000 +0400
871	@@ -0,0 +1,3 @@
872	+SELECT @@global.innodb_fast_checksum;
873	+@@global.innodb_fast_checksum
874	+0
875	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result
876	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
877	+++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result 2011-04-09 18:49:05.000000000 +0400
878	@@ -0,0 +1,3 @@
879	+SELECT @@global.innodb_flush_neighbor_pages;
880	+@@global.innodb_flush_neighbor_pages
881	+1
882	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result
883	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
884	+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result 2011-04-09 18:49:05.000000000 +0400
885	@@ -0,0 +1,3 @@
886	+SELECT @@global.innodb_ibuf_accel_rate;
887	+@@global.innodb_ibuf_accel_rate
888	+100
889	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result
890	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
891	+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result 2011-04-09 18:49:05.000000000 +0400
892	@@ -0,0 +1,3 @@
893	+SELECT @@global.innodb_ibuf_active_contract;
894	+@@global.innodb_ibuf_active_contract
895	+1
896	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result
897	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
898	+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result 2011-04-09 18:49:05.000000000 +0400
899	@@ -0,0 +1,3 @@
900	+SELECT @@global.innodb_ibuf_max_size;
901	+@@global.innodb_ibuf_max_size
902	+16760832
903	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result
904	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
905	+++ b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result 2011-04-09 18:49:05.000000000 +0400
906	@@ -0,0 +1,3 @@
907	+SELECT @@global.innodb_import_table_from_xtrabackup;
908	+@@global.innodb_import_table_from_xtrabackup
909	+0
910	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result
911	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
912	+++ b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result 2011-04-09 18:49:05.000000000 +0400
913	@@ -0,0 +1,3 @@
914	+SELECT @@global.innodb_lazy_drop_table;
915	+@@global.innodb_lazy_drop_table
916	+0
917	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result
918	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
919	+++ b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result 2011-04-09 18:49:05.000000000 +0400
920	@@ -0,0 +1,3 @@
921	+SELECT @@global.innodb_log_block_size;
922	+@@global.innodb_log_block_size
923	+512
924	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
925	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
926	+++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result 2011-04-09 18:49:05.000000000 +0400
927	@@ -0,0 +1,3 @@
928	+SELECT @@global.innodb_page_size;
929	+@@global.innodb_page_size
930	+16384
931	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result
932	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
933	+++ b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result 2011-04-09 18:49:05.000000000 +0400
934	@@ -0,0 +1,3 @@
935	+SELECT @@global.innodb_read_ahead;
936	+@@global.innodb_read_ahead
937	+linear
938	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result
939	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
940	+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result 2011-04-09 18:49:05.000000000 +0400
941	@@ -0,0 +1,3 @@
942	+SELECT @@global.innodb_recovery_stats;
943	+@@global.innodb_recovery_stats
944	+0
945	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result
946	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
947	+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result 2011-04-09 18:49:05.000000000 +0400
948	@@ -0,0 +1,3 @@
949	+SELECT @@global.innodb_recovery_update_relay_log;
950	+@@global.innodb_recovery_update_relay_log
951	+0
952	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result
953	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
954	+++ b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result 2011-04-09 18:49:05.000000000 +0400
955	@@ -0,0 +1,3 @@
956	+SELECT @@global.innodb_show_locks_held;
957	+@@global.innodb_show_locks_held
958	+10
959	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result
960	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
961	+++ b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result 2011-04-09 18:49:05.000000000 +0400
962	@@ -0,0 +1,3 @@
963	+SELECT @@global.innodb_show_verbose_locks;
964	+@@global.innodb_show_verbose_locks
965	+0
966	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result
967	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
968	+++ b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result 2011-04-09 18:49:05.000000000 +0400
969	@@ -0,0 +1,3 @@
970	+SELECT @@global.innodb_stats_auto_update;
971	+@@global.innodb_stats_auto_update
972	+1
973	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result
974	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
975	+++ b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result 2011-04-09 18:49:05.000000000 +0400
976	@@ -0,0 +1,3 @@
977	+SELECT @@global.innodb_stats_update_need_lock;
978	+@@global.innodb_stats_update_need_lock
979	+1
980	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result
981	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
982	+++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result 2011-04-09 18:49:05.000000000 +0400
983	@@ -0,0 +1,3 @@
984	+SELECT @@global.innodb_thread_concurrency_timer_based;
985	+@@global.innodb_thread_concurrency_timer_based
986	+0
987	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result
988	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
989	+++ b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result 2011-04-09 18:49:05.000000000 +0400
990	@@ -0,0 +1,3 @@
991	+SELECT @@global.innodb_use_global_flush_log_at_trx_commit;
992	+@@global.innodb_use_global_flush_log_at_trx_commit
993	+1
994	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result
995	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
996	+++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result 2011-04-09 18:49:05.000000000 +0400
997	@@ -0,0 +1,3 @@
998	+SELECT @@global.innodb_use_sys_stats_table;
999	+@@global.innodb_use_sys_stats_table
1000	+0
1001	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
1002	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1003	+++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result 2011-04-09 18:49:05.000000000 +0400
1004	@@ -0,0 +1,3 @@
1005	+SELECT @@global.log_slow_filter;
1006	+@@global.log_slow_filter
1007	+
1008	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
1009	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1010	+++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result 2011-04-09 18:49:05.000000000 +0400
1011	@@ -0,0 +1,3 @@
1012	+SELECT @@global.log_slow_rate_limit;
1013	+@@global.log_slow_rate_limit
1014	+1
1015	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result
1016	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1017	+++ b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result 2011-04-09 18:49:05.000000000 +0400
1018	@@ -0,0 +1,3 @@
1019	+SELECT @@global.log_slow_slave_statements;
1020	+@@global.log_slow_slave_statements
1021	+0
1022	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
1023	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1024	+++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result 2011-04-09 18:49:05.000000000 +0400
1025	@@ -0,0 +1,3 @@
1026	+SELECT @@global.log_slow_verbosity;
1027	+@@global.log_slow_verbosity
1028	+
1029	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result
1030	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1031	+++ b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result 2011-04-09 18:49:05.000000000 +0400
1032	@@ -0,0 +1,3 @@
1033	+SELECT @@global.log_warnings_suppress;
1034	+@@global.log_warnings_suppress
1035	+
1036	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result
1037	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1038	+++ b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result 2011-04-09 18:49:05.000000000 +0400
1039	@@ -0,0 +1,3 @@
1040	+SELECT @@global.optimizer_fix;
1041	+@@global.optimizer_fix
1042	+1
1043	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result
1044	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1045	+++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result 2011-04-09 18:49:05.000000000 +0400
1046	@@ -0,0 +1,3 @@
1047	+SELECT @@global.query_cache_strip_comments;
1048	+@@global.query_cache_strip_comments
1049	+0
1050	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result
1051	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1052	+++ b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result 2011-04-09 18:49:05.000000000 +0400
1053	@@ -0,0 +1,3 @@
1054	+SELECT @@global.query_response_time_range_base;
1055	+@@global.query_response_time_range_base
1056	+10
1057	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result
1058	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1059	+++ b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result 2011-04-09 18:49:05.000000000 +0400
1060	@@ -0,0 +1,3 @@
1061	+SELECT @@global.query_response_time_stats;
1062	+@@global.query_response_time_stats
1063	+0
1064	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result
1065	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1066	+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result 2011-04-09 18:49:05.000000000 +0400
1067	@@ -0,0 +1,3 @@
1068	+SELECT @@global.slow_query_log_timestamp_always;
1069	+@@global.slow_query_log_timestamp_always
1070	+0
1071	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result
1072	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1073	+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result 2011-04-09 18:49:05.000000000 +0400
1074	@@ -0,0 +1,3 @@
1075	+SELECT @@global.slow_query_log_timestamp_precision;
1076	+@@global.slow_query_log_timestamp_precision
1077	+second
1078	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result
1079	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1080	+++ b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result 2011-04-09 18:49:05.000000000 +0400
1081	@@ -0,0 +1,3 @@
1082	+SELECT @@global.slow_query_log_use_global_control;
1083	+@@global.slow_query_log_use_global_control
1084	+
1085	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result
1086	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1087	+++ b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result 2011-04-09 18:49:05.000000000 +0400
1088	@@ -0,0 +1,3 @@
1089	+SELECT @@global.thread_statistics;
1090	+@@global.thread_statistics
1091	+0
1092	diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/userstat_basic.result
1093	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1094	+++ b/mysql-test/suite/sys_vars/r/userstat_basic.result 2011-04-09 18:49:05.000000000 +0400
1095	@@ -0,0 +1,3 @@
1096	+SELECT @@global.userstat;
1097	+@@global.userstat
1098	+0
1099	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test
1100	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1101	+++ b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test 2011-04-09 18:49:05.000000000 +0400
1102	@@ -0,0 +1 @@
1103	+SELECT @@global.fast_index_creation;
1104	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/have_response_time_distribution_basic.test
1105	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1106	+++ b/mysql-test/suite/sys_vars/t/have_response_time_distribution_basic.test 2011-04-09 18:49:05.000000000 +0400
1107	@@ -0,0 +1 @@
1108	+SELECT @@global.have_response_time_distribution;
1109	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test
1110	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1111	+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test 2011-04-09 18:49:05.000000000 +0400
1112	@@ -0,0 +1 @@
1113	+SELECT @@global.innodb_adaptive_flushing_method;
1114	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test
1115	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1116	+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test 2011-04-09 18:49:05.000000000 +0400
1117	@@ -0,0 +1 @@
1118	+SELECT @@global.innodb_adaptive_hash_index_partitions;
1119	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test
1120	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1121	+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test 2011-04-09 18:49:05.000000000 +0400
1122	@@ -0,0 +1 @@
1123	+SELECT @@global.innodb_buffer_pool_restore_at_startup;
1124	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test
1125	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1126	+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test 2011-04-09 18:49:05.000000000 +0400
1127	@@ -0,0 +1 @@
1128	+SELECT @@global.innodb_buffer_pool_shm_checksum;
1129	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test
1130	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1131	+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test 2011-04-09 18:49:05.000000000 +0400
1132	@@ -0,0 +1 @@
1133	+SELECT @@global.innodb_buffer_pool_shm_key;
1134	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test
1135	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1136	+++ b/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test 2011-04-09 18:49:05.000000000 +0400
1137	@@ -0,0 +1 @@
1138	+SELECT @@global.innodb_checkpoint_age_target;
1139	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test
1140	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1141	+++ b/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test 2011-04-09 18:49:05.000000000 +0400
1142	@@ -0,0 +1 @@
1143	+SELECT @@global.innodb_corrupt_table_action;
1144	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test
1145	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1146	+++ b/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test 2011-04-09 18:49:05.000000000 +0400
1147	@@ -0,0 +1 @@
1148	+SELECT @@global.innodb_dict_size_limit;
1149	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test
1150	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1151	+++ b/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test 2011-04-09 18:49:05.000000000 +0400
1152	@@ -0,0 +1 @@
1153	+SELECT @@global.innodb_doublewrite_file;
1154	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test
1155	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1156	+++ b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test 2011-04-09 18:49:05.000000000 +0400
1157	@@ -0,0 +1 @@
1158	+SELECT @@global.innodb_fast_checksum;
1159	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test
1160	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1161	+++ b/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test 2011-04-09 18:49:05.000000000 +0400
1162	@@ -0,0 +1 @@
1163	+SELECT @@global.innodb_flush_neighbor_pages;
1164	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test
1165	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1166	+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test 2011-04-09 18:49:05.000000000 +0400
1167	@@ -0,0 +1 @@
1168	+SELECT @@global.innodb_ibuf_accel_rate;
1169	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test
1170	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1171	+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test 2011-04-09 18:49:05.000000000 +0400
1172	@@ -0,0 +1 @@
1173	+SELECT @@global.innodb_ibuf_active_contract;
1174	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test
1175	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1176	+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test 2011-04-09 18:49:05.000000000 +0400
1177	@@ -0,0 +1 @@
1178	+SELECT @@global.innodb_ibuf_max_size;
1179	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test
1180	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1181	+++ b/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test 2011-04-09 18:49:05.000000000 +0400
1182	@@ -0,0 +1 @@
1183	+SELECT @@global.innodb_import_table_from_xtrabackup;
1184	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test
1185	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1186	+++ b/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test 2011-04-09 18:49:05.000000000 +0400
1187	@@ -0,0 +1 @@
1188	+SELECT @@global.innodb_lazy_drop_table;
1189	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test
1190	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1191	+++ b/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test 2011-04-09 18:49:05.000000000 +0400
1192	@@ -0,0 +1 @@
1193	+SELECT @@global.innodb_log_block_size;
1194	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test
1195	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1196	+++ b/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test 2011-04-09 18:49:05.000000000 +0400
1197	@@ -0,0 +1 @@
1198	+SELECT @@global.innodb_page_size;
1199	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test
1200	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1201	+++ b/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test 2011-04-09 18:49:05.000000000 +0400
1202	@@ -0,0 +1 @@
1203	+SELECT @@global.innodb_read_ahead;
1204	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test
1205	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1206	+++ b/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test 2011-04-09 18:49:05.000000000 +0400
1207	@@ -0,0 +1 @@
1208	+SELECT @@global.innodb_recovery_stats;
1209	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test
1210	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1211	+++ b/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test 2011-04-09 18:49:05.000000000 +0400
1212	@@ -0,0 +1 @@
1213	+SELECT @@global.innodb_recovery_update_relay_log;
1214	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test
1215	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1216	+++ b/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test 2011-04-09 18:49:05.000000000 +0400
1217	@@ -0,0 +1 @@
1218	+SELECT @@global.innodb_show_locks_held;
1219	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test
1220	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1221	+++ b/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test 2011-04-09 18:49:05.000000000 +0400
1222	@@ -0,0 +1 @@
1223	+SELECT @@global.innodb_show_verbose_locks;
1224	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test
1225	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1226	+++ b/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test 2011-04-09 18:49:05.000000000 +0400
1227	@@ -0,0 +1 @@
1228	+SELECT @@global.innodb_stats_auto_update;
1229	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test
1230	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1231	+++ b/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test 2011-04-09 18:49:05.000000000 +0400
1232	@@ -0,0 +1 @@
1233	+SELECT @@global.innodb_stats_update_need_lock;
1234	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test
1235	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1236	+++ b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test 2011-04-09 18:49:05.000000000 +0400
1237	@@ -0,0 +1 @@
1238	+SELECT @@global.innodb_thread_concurrency_timer_based;
1239	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test
1240	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1241	+++ b/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test 2011-04-09 18:49:05.000000000 +0400
1242	@@ -0,0 +1 @@
1243	+SELECT @@global.innodb_use_global_flush_log_at_trx_commit;
1244	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test
1245	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1246	+++ b/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test 2011-04-09 18:49:05.000000000 +0400
1247	@@ -0,0 +1 @@
1248	+SELECT @@global.innodb_use_sys_stats_table;
1249	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test
1250	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1251	+++ b/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test 2011-04-09 18:49:05.000000000 +0400
1252	@@ -0,0 +1 @@
1253	+SELECT @@global.log_slow_filter;
1254	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test
1255	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1256	+++ b/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test 2011-04-09 18:49:05.000000000 +0400
1257	@@ -0,0 +1 @@
1258	+SELECT @@global.log_slow_rate_limit;
1259	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test
1260	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1261	+++ b/mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test 2011-04-09 18:49:05.000000000 +0400
1262	@@ -0,0 +1 @@
1263	+SELECT @@global.log_slow_slave_statements;
1264	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test
1265	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1266	+++ b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test 2011-04-09 18:49:05.000000000 +0400
1267	@@ -0,0 +1 @@
1268	+SELECT @@global.log_slow_verbosity;
1269	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_warnings_suppress_basic.test
1270	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1271	+++ b/mysql-test/suite/sys_vars/t/log_warnings_suppress_basic.test 2011-04-09 18:49:05.000000000 +0400
1272	@@ -0,0 +1 @@
1273	+SELECT @@global.log_warnings_suppress;
1274	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/optimizer_fix_basic.test
1275	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1276	+++ b/mysql-test/suite/sys_vars/t/optimizer_fix_basic.test 2011-04-09 18:49:05.000000000 +0400
1277	@@ -0,0 +1 @@
1278	+SELECT @@global.optimizer_fix;
1279	diff -ruN a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
1280	--- a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test 2011-04-09 18:48:03.000000000 +0400
1281	+++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test 2011-04-09 18:49:05.000000000 +0400
1282	@@ -6,17 +6,17 @@
1283	# on windows it's <basedir>/lib/plugin
1284	# on unix it's <basedir>/lib/mysql/plugin
1285	#
1286	---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
1287	+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
1288	select @@global.plugin_dir;
1289	--error ER_INCORRECT_GLOBAL_LOCAL_VAR
1290	select @@session.plugin_dir;
1291	---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
1292	+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
1293	show global variables like 'plugin_dir';
1294	---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
1295	+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
1296	show session variables like 'plugin_dir';
1297	---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
1298	+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
1299	select * from information_schema.global_variables where variable_name='plugin_dir';
1300	---replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ /
1301	+--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR MYSQL_LIBDIR64 MYSQL_LIBDIR /mysql/ /
1302	select * from information_schema.session_variables where variable_name='plugin_dir';
1303
1304	#
1305	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test
1306	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1307	+++ b/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test 2011-04-09 18:49:05.000000000 +0400
1308	@@ -0,0 +1 @@
1309	+SELECT @@global.query_cache_strip_comments;
1310	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/query_response_time_range_base_basic.test
1311	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1312	+++ b/mysql-test/suite/sys_vars/t/query_response_time_range_base_basic.test 2011-04-09 18:49:05.000000000 +0400
1313	@@ -0,0 +1 @@
1314	+SELECT @@global.query_response_time_range_base;
1315	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/query_response_time_stats_basic.test
1316	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1317	+++ b/mysql-test/suite/sys_vars/t/query_response_time_stats_basic.test 2011-04-09 18:49:05.000000000 +0400
1318	@@ -0,0 +1 @@
1319	+SELECT @@global.query_response_time_stats;
1320	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_always_basic.test
1321	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1322	+++ b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_always_basic.test 2011-04-09 18:49:05.000000000 +0400
1323	@@ -0,0 +1 @@
1324	+SELECT @@global.slow_query_log_timestamp_always;
1325	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_precision_basic.test
1326	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1327	+++ b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_precision_basic.test 2011-04-09 18:49:05.000000000 +0400
1328	@@ -0,0 +1 @@
1329	+SELECT @@global.slow_query_log_timestamp_precision;
1330	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/slow_query_log_use_global_control_basic.test
1331	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1332	+++ b/mysql-test/suite/sys_vars/t/slow_query_log_use_global_control_basic.test 2011-04-09 18:49:05.000000000 +0400
1333	@@ -0,0 +1 @@
1334	+SELECT @@global.slow_query_log_use_global_control;
1335	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/thread_statistics_basic.test
1336	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1337	+++ b/mysql-test/suite/sys_vars/t/thread_statistics_basic.test 2011-04-09 18:49:05.000000000 +0400
1338	@@ -0,0 +1 @@
1339	+SELECT @@global.thread_statistics;
1340	diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/userstat_basic.test
1341	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1342	+++ b/mysql-test/suite/sys_vars/t/userstat_basic.test 2011-04-09 18:49:05.000000000 +0400
1343	@@ -0,0 +1 @@
1344	+SELECT @@global.userstat;