updated results for big tests

mysql-test/r/information_schema-big.result

@@ -20,6 +20,7 @@ c2.column_name LIKE '%SCHEMA%'
 AND t.table_name NOT LIKE 'innodb%';
 table_name	column_name
 CHARACTER_SETS	CHARACTER_SET_NAME
+CLIENT_STATISTICS	CLIENT
 COLLATIONS	COLLATION_NAME
 COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
 COLUMNS	TABLE_SCHEMA
@@ -29,6 +30,8 @@ EVENTS	EVENT_SCHEMA
 FILES	TABLE_SCHEMA
 GLOBAL_STATUS	VARIABLE_NAME
 GLOBAL_VARIABLES	VARIABLE_NAME
+INDEX_STATISTICS	TABLE_SCHEMA
+KEY_CACHES	KEY_CACHE_NAME
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
 PARAMETERS	SPECIFIC_SCHEMA
 PARTITIONS	TABLE_SCHEMA
@@ -46,9 +49,13 @@ TABLES	TABLE_SCHEMA
 TABLESPACES	TABLESPACE_NAME
 TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
 TABLE_PRIVILEGES	TABLE_SCHEMA
+TABLE_STATISTICS	TABLE_SCHEMA
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
+USER_STATISTICS	USER
 VIEWS	TABLE_SCHEMA
+PBXT_STATISTICS	ID
+XTRADB_ADMIN_COMMAND	result_message
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -66,6 +73,7 @@ c2.column_name LIKE '%SCHEMA%'
 AND t.table_name NOT LIKE 'innodb%';
 table_name	column_name
 CHARACTER_SETS	CHARACTER_SET_NAME
+CLIENT_STATISTICS	CLIENT
 COLLATIONS	COLLATION_NAME
 COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
 COLUMNS	TABLE_SCHEMA
@@ -75,6 +83,8 @@ EVENTS	EVENT_SCHEMA
 FILES	TABLE_SCHEMA
 GLOBAL_STATUS	VARIABLE_NAME
 GLOBAL_VARIABLES	VARIABLE_NAME
+INDEX_STATISTICS	TABLE_SCHEMA
+KEY_CACHES	KEY_CACHE_NAME
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
 PARAMETERS	SPECIFIC_SCHEMA
 PARTITIONS	TABLE_SCHEMA
@@ -92,6 +102,10 @@ TABLES	TABLE_SCHEMA
 TABLESPACES	TABLESPACE_NAME
 TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
 TABLE_PRIVILEGES	TABLE_SCHEMA
+TABLE_STATISTICS	TABLE_SCHEMA
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
+USER_STATISTICS	USER
 VIEWS	TABLE_SCHEMA
+PBXT_STATISTICS	ID
+XTRADB_ADMIN_COMMAND	result_message

mysql-test/r/merge-big.result

@@ -8,7 +8,7 @@ CREATE TABLE t1 (c1 INT) ENGINE= MyISAM;
 LOCK TABLE t1 WRITE;
 # connection con1
 SET @orig_debug=@@debug;
-SET GLOBAL debug="+d,sleep_open_and_lock_after_open";
+SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open";
 INSERT INTO t1 VALUES (1);
 # connection default
 # Let INSERT go into thr_multi_lock().
@@ -22,6 +22,6 @@ SELECT * FROM t1;
 c1
 UNLOCK TABLES;
 # connection con1
-SET GLOBAL debug=@orig_debug;
+SET GLOBAL debug_dbug=@orig_debug;
 # connection default
 DROP TABLE t1;

mysql-test/suite/maria/r/maria-purge.result

@@ -1,7 +1,7 @@
 * shut down mysqld, removed logs, restarted it
 set global storage_engine=aria;
 set session storage_engine=aria;
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop table if exists t1,t2;
 SET SQL_WARNINGS=1;
 CREATE TABLE t1 (

mysql-test/suite/maria/r/maria-recovery-big.result

@@ -1,4 +1,4 @@
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;
@@ -60,7 +60,7 @@ select a,length(b) from t1;
 a	length(b)
 1	8
 2	5
-SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
+SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
 * crashing mysqld intentionally
 set global aria_checkpoint_interval=1;
 ERROR HY000: Lost connection to MySQL server during query

mysql-test/suite/maria/t/maria-purge.test

@@ -21,7 +21,7 @@ set session storage_engine=aria;
 let $def_logsize=`select @@global.aria_log_file_size`;
 let $def_checkinterval=`select @@global.aria_checkpoint_interval`;
 
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 # Initialise
 --disable_warnings
 drop table if exists t1,t2;

mysql-test/suite/maria/t/maria-recovery-big.test

@@ -9,7 +9,7 @@
 --source include/have_maria.inc
 --source include/big_test.inc
 
-set global aria_log_file_size=4294967295;
+set global aria_log_file_size=4294959104;
 
 --disable_warnings
 drop database if exists mysqltest;