pull changes from parent

mysql-test/suite/innodb/t/innodb-autoinc-44030.test

@@ -2,6 +2,8 @@
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
+let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -32,3 +34,10 @@ SHOW CREATE TABLE t1;
 INSERT INTO t1 VALUES(null);
 SELECT * FROM t1;
 DROP TABLE t1;
+
+#
+# restore environment to the state it was before this test execution
+#
+
+-- disable_query_log
+eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;

mysql-test/suite/innodb/t/innodb-autoinc.test

@@ -2,6 +2,8 @@
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
+let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -662,3 +664,11 @@ INSERT INTO  t1 VALUES (1), (2), (-685113344), (NULL);
 SELECT * FROM t1;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
+
+
+#
+# restore environment to the state it was before this test execution
+#
+
+-- disable_query_log
+eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;

storage/innobase/handler/i_s.cc

@@ -1311,9 +1311,9 @@ static ST_FIELD_INFO	i_s_cmpmem_fields_info[] =
 	STRUCT_FLD(field_length,	MY_INT32_NUM_DECIMAL_DIGITS),
 	STRUCT_FLD(field_type,		MYSQL_TYPE_LONG),
 	STRUCT_FLD(value,		0),
-	STRUCT_FLD(field_flags,	0),
+	STRUCT_FLD(field_flags,		0),
 	STRUCT_FLD(old_name,		"Buffer Pool Id"),
-	STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
+	STRUCT_FLD(open_method,		SKIP_OPEN_TABLE)},
 
 	{STRUCT_FLD(field_name,		"pages_used"),
 	 STRUCT_FLD(field_length,	MY_INT32_NUM_DECIMAL_DIGITS),
@@ -1345,7 +1345,7 @@ static ST_FIELD_INFO	i_s_cmpmem_fields_info[] =
 	 STRUCT_FLD(value,		0),
 	 STRUCT_FLD(field_flags,	0),
 	 STRUCT_FLD(old_name,		"Total Duration of Relocations,"
-		    " in Seconds"),
+		    			" in Seconds"),
 	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
 
 	END_OF_ST_FIELD_INFO

storage/innobase/srv/srv0srv.c

@@ -2065,9 +2065,10 @@ srv_export_innodb_status(void)
 	export_vars.innodb_buffer_pool_pages_latched
 		= buf_get_latched_pages_number();
 #endif /* UNIV_DEBUG */
-	export_vars.innodb_buffer_pool_pages_total = buf_pool_get_curr_size();
+	export_vars.innodb_buffer_pool_pages_total = buf_pool_get_n_pages();
 
-	export_vars.innodb_buffer_pool_pages_misc = buf_pool_get_curr_size();
+	export_vars.innodb_buffer_pool_pages_misc
+	       	= buf_pool_get_n_pages() - LRU_len - free_len;
 #ifdef HAVE_ATOMIC_BUILTINS
 	export_vars.innodb_have_atomic_builtins = 1;
 #else