Fix failed testcase

AliSQL · AliSQL · commit 2bd21803c927 · 2016-10-08T11:48:50.000+08:00
diff --git a/mysql-test/r/compress_column.result b/mysql-test/r/compress_column.result
@@ -1,7 +1,7 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 create table t1 (a int column_format compressed) CHARACTER SET gbk engine=innodb;
 Warnings:
-Warning	1887	Can not define column 'a' in compressed format, silently change column_format to default
+Warning	1888	Can not define column 'a' in compressed format, silently change column_format to default
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/thread_memory_usage.result b/mysql-test/r/thread_memory_usage.result
@@ -4,7 +4,7 @@ select * from test.t1;
 id
 1
 show full processlist;
-Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query
-#	root	localhost	test	#	xxx	#	#	#	#
-#	root	localhost	test	#	xxx	#	#	#	#
+Id	User	Host	db	Command	Time	State	Info	Memory_used	Memory_used_by_query	Logical_read	Physical_sync_read	Physical_async_read
+#	root	localhost	test	#	xxx	#	#	#	#	#	#	#
+#	root	localhost	test	#	xxx	#	#	#	#	#	#	#
 drop table test.t1;
diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result
@@ -43,7 +43,6 @@ buffer_data_written	disabled
 buffer_flush_batch_scanned	disabled
 buffer_flush_batch_num_scan	disabled
 buffer_flush_batch_scanned_per_call	disabled
-buffer_flush_batch_rescan	disabled
 buffer_flush_batch_total_pages	disabled
 buffer_flush_batches	disabled
 buffer_flush_batch_pages	disabled
@@ -68,9 +67,12 @@ buffer_flush_background_pages	disabled
 buffer_LRU_batch_scanned	disabled
 buffer_LRU_batch_num_scan	disabled
 buffer_LRU_batch_scanned_per_call	disabled
-buffer_LRU_batch_total_pages	disabled
-buffer_LRU_batches	disabled
-buffer_LRU_batch_pages	disabled
+buffer_LRU_batch_flush_total_pages	disabled
+buffer_LRU_batches_flush	disabled
+buffer_LRU_batch_flush_pages	disabled
+buffer_LRU_batch_evict_total_pages	disabled
+buffer_LRU_batches_evict	disabled
+buffer_LRU_batch_evict_pages	disabled
 buffer_LRU_single_flush_scanned	disabled
 buffer_LRU_single_flush_num_scan	disabled
 buffer_LRU_single_flush_scanned_per_call	disabled
diff --git a/mysql-test/suite/rpl/r/rpl_plugin_load.result b/mysql-test/suite/rpl/r/rpl_plugin_load.result
@@ -18,6 +18,7 @@ Verify that example engine is installed.
 SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 EXAMPLE	YES	Example storage engine	NO	NO	NO
+include/sync_slave_sql_with_master.inc
 connection slave: Verify that example engine is not installed.
 SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
@@ -32,5 +33,6 @@ Delta
 Verify that example engine is not installed.
 SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
 End of test
diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
@@ -26,6 +26,8 @@ INNODB_RDS_COLUMN_ZLIB_WRAP
 INNODB_RDS_COLUMN_ZLIB_WRAP
 INNODB_RDS_MIN_CONCURRENCY_TICKETS
 INNODB_RDS_MIN_CONCURRENCY_TICKETS
+INNODB_RDS_READ_VIEW_CACHE
+INNODB_RDS_READ_VIEW_CACHE
 RDS_FILTER_KEY_CMP_IN_ORDER
 RDS_FILTER_KEY_CMP_IN_ORDER
 RDS_INDEXSTAT
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
@@ -470,7 +470,9 @@ trx_free_prepared(
 	/* Undo trx_resurrect_table_locks(). */
 	UT_LIST_INIT(trx->lock.trx_locks);
 
+	mutex_enter(&trx_sys->mutex);
 	trx_release_descriptor(trx);
+	mutex_exit(&trx_sys->mutex);
 
 	trx_free_low(trx);
 }

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,9 @@ trx_free_prepared(`
`470`	`470`	`/* Undo trx_resurrect_table_locks(). */`
`471`	`471`	`UT_LIST_INIT(trx->lock.trx_locks);`
`472`	`472`
	`473`	`+ mutex_enter(&trx_sys->mutex);`
`473`	`474`	`trx_release_descriptor(trx);`
	`475`	`+ mutex_exit(&trx_sys->mutex);`
`474`	`476`
`475`	`477`	`trx_free_low(trx);`
`476`	`478`	`}`