Merge lp:~percona-dev/percona-xtradb/fix-bug395784 into lp:~percona-dev/percona-xtradb/extensions-1.0

[Aleksandr Kuzminsky]

[Aleksandr Kuzminsky (akuzminsky)]

[akuzminsky@sm1u02 mysql-test]$ ./mtr innodb_xtradb_bug317074
Logging: ./mtr innodb_xtradb_bug317074
MySQL Version 5.1.36
Checking supported features...
 - skipping ndbcluster, mysqld not compiled with ndbcluster
 - skipping SSL, mysqld not compiled with SSL
Collecting tests...
vardir: /mnt/data1/home/akuzminsky/src/xtradb/bug395784/mysql-5.1.36/mysql-test/var
Removing old var directory...
Creating var directory '/mnt/data1/home/akuzminsky/src/xtradb/bug395784/mysql-5.1.36/mysql-test/var'...
Installing system database...
Using server port 47193

==============================================================================

TEST RESULT TIME (ms)
------------------------------------------------------------

worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 13000..13009
main.innodb_xtradb_bug317074 [ pass ] 69157
------------------------------------------------------------
The servers were restarted 0 times
Spent 69.157 of 71 seconds executing testcases

All 1 tests were successful.

[akuzminsky@sm1u02 mysql-test]$

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== modified file 'innodb_split_buf_pool_mutex.patch'
--- innodb_split_buf_pool_mutex.patch	2009-06-24 05:26:28 +0000
+++ innodb_split_buf_pool_mutex.patch	2009-07-05 17:32:01 +0000
@@ -3907,18 +3907,49 @@
  
  			mtr_memo_slot_release(mtr, slot);
  
-diff -ruN innodb_plugin-1.0.3_orig/mysql-test/innodb_xtradb_bug317074.result innodb_plugin-1.0.3_tmp/mysql-test/innodb_xtradb_bug317074.result
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ innodb_plugin-1.0.3_tmp/mysql-test/innodb_xtradb_bug317074.result	2009-06-09 13:58:04.000000000 +0900
-@@ -0,0 +1,2 @@
+diff -ruN innodb_plugin-1.0.3_orig/sync/sync0sync.c innodb_plugin-1.0.3_tmp/sync/sync0sync.c
+--- innodb_plugin-1.0.3_orig/sync/sync0sync.c	2009-02-17 16:56:33.000000000 +0900
++++ innodb_plugin-1.0.3_tmp/sync/sync0sync.c	2009-06-11 18:59:30.000000000 +0900
+@@ -1081,6 +1081,12 @@
+ 	case SYNC_TRX_SYS_HEADER:
+ 	case SYNC_FILE_FORMAT_TAG:
+ 	case SYNC_DOUBLEWRITE:
++	case SYNC_BUF_LRU_LIST:
++	case SYNC_BUF_FLUSH_LIST:
++	case SYNC_BUF_PAGE_HASH:
++	case SYNC_BUF_FREE_LIST:
++	case SYNC_BUF_ZIP_FREE:
++	case SYNC_BUF_ZIP_HASH:
+ 	case SYNC_BUF_POOL:
+ 	case SYNC_SEARCH_SYS:
+ 	case SYNC_SEARCH_SYS_CONF:
+@@ -1107,7 +1113,7 @@
+ 		/* Either the thread must own the buffer pool mutex
+ 		(buf_pool_mutex), or it is allowed to latch only ONE
+ 		buffer block (block->mutex or buf_pool_zip_mutex). */
+-		ut_a((sync_thread_levels_contain(array, SYNC_BUF_POOL)
++		ut_a((sync_thread_levels_contain(array, SYNC_BUF_LRU_LIST)
+ 		      && sync_thread_levels_g(array, SYNC_BUF_BLOCK - 1))
+ 		     || sync_thread_levels_g(array, SYNC_BUF_BLOCK));
+ 		break;
+diff -Nur a/mysql-test/innodb_xtradb_bug317074.result b/mysql-test/innodb_xtradb_bug317074.result
+--- a/mysql-test/innodb_xtradb_bug317074.result	1970-01-01 00:00:00.000000000 +0000
++++ b/mysql-test/innodb_xtradb_bug317074.result	2009-07-05 17:28:06.000000000 +0000
+@@ -0,0 +1,5 @@
++SET @old_innodb_file_format=@@innodb_file_format;
++SET @old_innodb_file_per_table=@@innodb_file_per_table;
++SET @old_innodb_file_format_check=@@innodb_file_format_check;
 +SET GLOBAL innodb_file_format='Barracuda';
 +SET GLOBAL innodb_file_per_table=ON;
-diff -ruN innodb_plugin-1.0.3_orig/mysql-test/innodb_xtradb_bug317074.test innodb_plugin-1.0.3_tmp/mysql-test/innodb_xtradb_bug317074.test
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ innodb_plugin-1.0.3_tmp/mysql-test/innodb_xtradb_bug317074.test	2009-06-09 13:58:04.000000000 +0900
-@@ -0,0 +1,38 @@
+diff -Nur a/mysql-test/innodb_xtradb_bug317074.test b/mysql-test/innodb_xtradb_bug317074.test
+--- a/mysql-test/innodb_xtradb_bug317074.test	1970-01-01 00:00:00.000000000 +0000
++++ b/mysql-test/innodb_xtradb_bug317074.test	2009-07-05 17:28:06.000000000 +0000
+@@ -0,0 +1,44 @@
 +-- source include/have_innodb.inc
 +
++SET @old_innodb_file_format=@@innodb_file_format;
++SET @old_innodb_file_per_table=@@innodb_file_per_table;
++SET @old_innodb_file_format_check=@@innodb_file_format_check;
 +SET GLOBAL innodb_file_format='Barracuda';
 +SET GLOBAL innodb_file_per_table=ON;
 +
@@ -3955,28 +3986,6 @@
 +ALTER TABLE test1 ENGINE=MyISAM;
 +
 +DROP TABLE test1;
-diff -ruN innodb_plugin-1.0.3_orig/sync/sync0sync.c innodb_plugin-1.0.3_tmp/sync/sync0sync.c
---- innodb_plugin-1.0.3_orig/sync/sync0sync.c	2009-02-17 16:56:33.000000000 +0900
-+++ innodb_plugin-1.0.3_tmp/sync/sync0sync.c	2009-06-11 18:59:30.000000000 +0900
-@@ -1081,6 +1081,12 @@
- 	case SYNC_TRX_SYS_HEADER:
- 	case SYNC_FILE_FORMAT_TAG:
- 	case SYNC_DOUBLEWRITE:
-+	case SYNC_BUF_LRU_LIST:
-+	case SYNC_BUF_FLUSH_LIST:
-+	case SYNC_BUF_PAGE_HASH:
-+	case SYNC_BUF_FREE_LIST:
-+	case SYNC_BUF_ZIP_FREE:
-+	case SYNC_BUF_ZIP_HASH:
- 	case SYNC_BUF_POOL:
- 	case SYNC_SEARCH_SYS:
- 	case SYNC_SEARCH_SYS_CONF:
-@@ -1107,7 +1113,7 @@
- 		/* Either the thread must own the buffer pool mutex
- 		(buf_pool_mutex), or it is allowed to latch only ONE
- 		buffer block (block->mutex or buf_pool_zip_mutex). */
--		ut_a((sync_thread_levels_contain(array, SYNC_BUF_POOL)
-+		ut_a((sync_thread_levels_contain(array, SYNC_BUF_LRU_LIST)
- 		      && sync_thread_levels_g(array, SYNC_BUF_BLOCK - 1))
- 		     || sync_thread_levels_g(array, SYNC_BUF_BLOCK));
- 		break;
++SET GLOBAL innodb_file_format=@old_innodb_file_format;
++SET GLOBAL innodb_file_per_table=@old_innodb_file_per_table;
++SET GLOBAL innodb_file_format_check=@old_innodb_file_format_check;