Merge lp:~percona-dev/percona-xtradb/windows-conscious into lp:~percona-dev/percona-xtradb/extensions-1.0

[Yasufumi Kinoshita]

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== modified file 'i_s_innodb_buffer_pool_pages.patch'
--- i_s_innodb_buffer_pool_pages.patch	2009-09-03 08:25:21 +0000
+++ i_s_innodb_buffer_pool_pages.patch	2009-09-09 05:07:10 +0000
@@ -450,7 +450,7 @@
 +            field_store_string(table->field[0], NULL);
 +            p = (char *)index->table_name;
 +          }
-+          strcpy(table_name_raw, p);
++          strcpy(table_name_raw, (const char*)p);
 +          filename_to_tablename(table_name_raw, table_name, sizeof(table_name));
 +          field_store_string(table->field[1], table_name);
 +          field_store_string(table->field[2], index->name);

=== modified file 'innodb_expand_import.patch'
--- innodb_expand_import.patch	2009-09-03 08:25:21 +0000
+++ innodb_expand_import.patch	2009-09-09 05:07:10 +0000
@@ -35,6 +35,13 @@
 +		ulint	i;
 +		int		len;
 +		ib_uint64_t	current_lsn;
++		ulint		size_low, size_high, size;
++		ib_int64_t	size_bytes;
++		dict_table_t*	table;
++		dict_index_t*	index;
++		fil_system_t*	system;
++		fil_node_t*	node = NULL;
++		fil_space_t*	space;
 +
 +		current_lsn = log_get_lsn();
 +
@@ -56,25 +63,20 @@
 +		success = os_file_write(filepath, file, page, 0, 0, UNIV_PAGE_SIZE);
 +
 +		/* get file size */
-+		ulint		size_low, size_high, size;
-+		ib_int64_t	size_bytes;
 +		os_file_get_size(file, &size_low, &size_high);
 +		size_bytes = (((ib_int64_t)size_high) << 32)
 +				+ (ib_int64_t)size_low;
 +
 +		/* get cruster index information */
-+		dict_table_t*   table;
-+		dict_index_t*   index;
 +		table = dict_table_get_low(name);
 +		index = dict_table_get_first_index(table);
 +		ut_a(index->page==3);
 +
-+
 +		/* read metadata from .exp file */
 +		n_index = 0;
-+		bzero(old_id, sizeof(old_id));
-+		bzero(new_id, sizeof(new_id));
-+		bzero(root_page, sizeof(root_page));
++		memset(old_id, 0, sizeof(old_id));
++		memset(new_id, 0, sizeof(new_id));
++		memset(root_page, 0, sizeof(root_page));
 +
 +		info_file_path = fil_make_ibd_name(name, FALSE);
 +		len = strlen(info_file_path);
@@ -124,10 +126,10 @@
 +			mem_heap_t*	heap = NULL;
 +			ulint		offsets_[REC_OFFS_NORMAL_SIZE];
 +			ulint*		offsets = offsets_;
++			ib_int64_t	offset;
++
 +			size = (ulint) (size_bytes / UNIV_PAGE_SIZE);
 +			/* over write space id of all pages */
-+			ib_int64_t     offset;
-+
 +			rec_offs_init(offsets_);
 +
 +			fprintf(stderr, "InnoDB: Progress in %:");
@@ -280,10 +282,8 @@
 +		}
 +		mem_free(info_file_path);
 +
-+		fil_system_t*	system	= fil_system;
++		system	= fil_system;
 +		mutex_enter(&(system->mutex));
-+		fil_node_t*	node = NULL;
-+		fil_space_t*	space;
 +		space = fil_space_get_by_id(id);
 +		if (space)
 +			node = UT_LIST_GET_FIRST(space->chain);

=== modified file 'innodb_extra_rseg.patch'
--- innodb_extra_rseg.patch	2009-09-03 08:25:21 +0000
+++ innodb_extra_rseg.patch	2009-09-09 05:07:10 +0000
@@ -280,7 +280,7 @@
 diff -ru innodb_plugin-1.0.4_orig/srv/srv0start.c innodb_plugin-1.0.4_tmp/srv/srv0start.c
 --- innodb_plugin-1.0.4_orig/srv/srv0start.c	2009-07-01 03:21:09.000000000 +0900
 +++ innodb_plugin-1.0.4_tmp/srv/srv0start.c	2009-09-01 16:56:05.000000000 +0900
-@@ -1533,6 +1533,8 @@
+@@ -1544,6 +1544,8 @@
  		dict_create();
  		srv_startup_is_before_trx_rollback_phase = FALSE;
  

=== modified file 'innodb_io_patches.patch'
--- innodb_io_patches.patch	2009-09-03 08:25:21 +0000
+++ innodb_io_patches.patch	2009-09-09 05:07:10 +0000
@@ -873,11 +873,11 @@
 +					/* defence line (max_checkpoint_age * 1/2) */
 +					ib_uint64_t	lsn = log_sys->lsn;
 +
-+					mutex_exit(&(log_sys->mutex));
-+
 +					ib_uint64_t level, bpl;
 +					buf_page_t* bpage;
 +
++					mutex_exit(&(log_sys->mutex));
++
 +					mutex_enter(&flush_list_mutex);
 +
 +					level = 0;
@@ -956,3 +956,33 @@
  	}
  
  	srv_main_thread_op_info = "reserving kernel mutex";
+diff -ru innodb_plugin-1.0.4_orig/srv/srv0start.c innodb_plugin-1.0.4_tmp/srv/srv0start.c
+--- innodb_plugin-1.0.4_orig/srv/srv0start.c	2009-07-01 03:21:09.000000000 +0900
++++ innodb_plugin-1.0.4_tmp/srv/srv0start.c	2009-09-09 13:50:32.000000000 +0900
+@@ -1175,7 +1175,12 @@
+ 		break;
+ 	default:
+ 		/* On Win 2000 and XP use async i/o */
+-		os_aio_use_native_aio = TRUE;
++		//os_aio_use_native_aio = TRUE;
++		os_aio_use_native_aio = FALSE;
++		fprintf(stderr,
++			"InnoDB: Windows native async i/o is disabled as default.\n"
++			"InnoDB:   It is not applicable for the current"
++			" multi io threads implementation.\n");
+ 		break;
+ 	}
+ #endif
+@@ -1212,6 +1217,12 @@
+ 	} else if (0 == ut_strcmp(srv_file_flush_method_str,
+ 				  "async_unbuffered")) {
+ 		srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
++		os_aio_use_native_aio = TRUE;
++		srv_n_read_io_threads = srv_n_write_io_threads = 1;
++		fprintf(stderr,
++			"InnoDB: 'async_unbuffered' was detected as innodb_flush_method.\n"
++			"InnoDB:   Windows native async i/o is enabled.\n"
++			"InnoDB:   And io threads are restricted.\n");
+ #endif
+ 	} else {
+ 		fprintf(stderr,

=== modified file 'innodb_opt_lru_count.patch'
--- innodb_opt_lru_count.patch	2009-09-03 08:25:21 +0000
+++ innodb_opt_lru_count.patch	2009-09-09 05:07:10 +0000
@@ -121,19 +121,21 @@
  
  	n_replaceable = UT_LIST_GET_LEN(buf_pool->free);
  
-@@ -1185,6 +1194,12 @@
+@@ -1185,7 +1194,13 @@
  		   + BUF_FLUSH_EXTRA_MARGIN)
  	       && (distance < BUF_LRU_FREE_SEARCH_LEN)) {
  
+-		mutex_t* block_mutex = buf_page_get_mutex(bpage);
++		mutex_t* block_mutex;
 +		if (!bpage->in_LRU_list) {
 +			/* reatart. but it is very optimistic */
 +			bpage = UT_LIST_GET_LAST(buf_pool->LRU);
 +			continue;
 +		}
-+
- 		mutex_t* block_mutex = buf_page_get_mutex(bpage);
++		block_mutex = buf_page_get_mutex(bpage);
  
  		mutex_enter(block_mutex);
+ 
 @@ -1200,7 +1215,9 @@
  		bpage = UT_LIST_GET_PREV(LRU, bpage);
  	}

=== modified file 'innodb_split_buf_pool_mutex.patch'
--- innodb_split_buf_pool_mutex.patch	2009-09-03 08:25:21 +0000
+++ innodb_split_buf_pool_mutex.patch	2009-09-09 05:07:10 +0000
@@ -379,20 +379,16 @@
  	ut_ad(!mutex_own(&buf_pool_zip_mutex));
  	ut_ad(!ut_align_offset(src, size));
  	ut_ad(!ut_align_offset(dst, size));
-@@ -429,9 +471,16 @@
- 	actually is a properly initialized buf_page_t object. */
- 
- 	if (size >= PAGE_ZIP_MIN_SIZE) {
-+		if (!have_page_hash_mutex)
-+			mutex_exit(&zip_free_mutex);
-+
+@@ -432,6 +474,12 @@
  		/* This is a compressed page. */
  		mutex_t*	mutex;
  
 +		if (!have_page_hash_mutex) {
++			mutex_exit(&zip_free_mutex);
 +			mutex_enter(&LRU_list_mutex);
 +			rw_lock_x_lock(&page_hash_latch);
 +		}
++
  		/* The src block may be split into smaller blocks,
  		some of which may be free.  Thus, the
  		mach_read_from_4() calls below may attempt to read
@@ -2125,11 +2121,11 @@
  	n_replaceable = UT_LIST_GET_LEN(buf_pool->free);
  
 @@ -1200,9 +1254,9 @@
+ 			bpage = UT_LIST_GET_LAST(buf_pool->LRU);
  			continue;
  		}
- 
--		mutex_t* block_mutex = buf_page_get_mutex(bpage);
-+		mutex_t* block_mutex = buf_page_get_mutex_enter(bpage);
+-		block_mutex = buf_page_get_mutex(bpage);
++		block_mutex = buf_page_get_mutex_enter(bpage);
  
 -		mutex_enter(block_mutex);
 +		ut_a(block_mutex);

=== modified file 'innodb_stats.patch'
--- innodb_stats.patch	2009-09-03 08:25:21 +0000
+++ innodb_stats.patch	2009-09-09 05:07:10 +0000
@@ -30,10 +30,12 @@
  	/* It makes no sense to test more pages than are contained
  	in the index, thus we lower the number if it is too high */
  	if (srv_stats_sample_pages > index->stat_index_size) {
-@@ -3289,6 +3296,20 @@
+@@ -3289,7 +3296,21 @@
  		}
  
  		while (rec != supremum) {
+-			rec_t*	next_rec = page_rec_get_next(rec);
++			rec_t*  next_rec;
 +			/* count recs */
 +			if (stats_method == SRV_STATS_METHOD_IGNORE_NULLS) {
 +				n_recs++;
@@ -47,10 +49,10 @@
 +					n_not_nulls[j]++;
 +				}
 +			}
-+
- 			rec_t*	next_rec = page_rec_get_next(rec);
++			next_rec = page_rec_get_next(rec);
  			if (next_rec == supremum) {
  				break;
+ 			}
 @@ -3303,7 +3324,7 @@
  			cmp_rec_rec_with_match(rec, next_rec,
  					       offsets_rec, offsets_next_rec,
@@ -391,7 +393,7 @@
 +					} else {
 +						rec_per_key = n_rows;
 +					}
-+					snprintf(buff, 256, (i == index->n_uniq)?"%llu":"%llu, ",
++					ut_snprintf(buff, 256, (i == index->n_uniq)?"%llu":"%llu, ",
 +						 rec_per_key);
 +					strncat(row_per_keys, buff, 256 - strlen(row_per_keys));
 +				}

=== modified file 'mysql-test.diff'
--- mysql-test.diff	2009-09-08 02:28:57 +0000
+++ mysql-test.diff	2009-09-09 05:07:10 +0000
@@ -458,62 +458,3 @@
 - alter table t1 add primary key (a), drop index c;
 - show create table t1;
 - --error ER_MULTIPLE_PRI_KEY
-diff -ruN innodb_plugin-1.0.4_orig/mysql-test/patches/innodb_file_per_table.diff innodb_plugin-1.0.4_tmp/mysql-test/patches/innodb_file_per_table.diff
---- innodb_plugin-1.0.4_orig/mysql-test/patches/innodb_file_per_table.diff	2009-01-27 15:04:17.000000000 +0900
-+++ innodb_plugin-1.0.4_tmp/mysql-test/patches/innodb_file_per_table.diff	2009-09-07 17:06:06.000000000 +0900
-@@ -1,6 +1,6 @@
--diff mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test.orig mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
----- mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test.orig	2008-10-07 11:32:30.000000000 +0300
--+++ mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test	2008-10-07 11:52:14.000000000 +0300
-+diff mysql-test/t/innodb_file_per_table_basic.test mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
-+--- mysql-test/t/innodb_file_per_table_basic.test	2008-10-07 11:32:30.000000000 +0300
-++++ mysql-test/t/innodb_file_per_table_basic.test	2008-10-07 11:52:14.000000000 +0300
- @@ -37,10 +37,6 @@
-  #   Check if Value can set                                         #
-  ####################################################################
-@@ -21,9 +21,9 @@
-  FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-  WHERE VARIABLE_NAME='innodb_file_per_table';
-  --echo 1 Expected
--diff mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result.orig mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
----- mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result.orig	2008-10-07 11:32:02.000000000 +0300
--+++ mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result	2008-10-07 11:52:47.000000000 +0300
-+diff mysql-test/r/innodb_file_per_table_basic.result mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
-+--- mysql-test/r/innodb_file_per_table_basic.result	2008-10-07 11:32:02.000000000 +0300
-++++ mysql-test/r/innodb_file_per_table_basic.result	2008-10-07 11:52:47.000000000 +0300
- @@ -4,18 +4,15 @@
-  1
-  1 Expected
-diff -ruN innodb_plugin-1.0.4_orig/mysql-test/patches/innodb_lock_wait_timeout.diff innodb_plugin-1.0.4_tmp/mysql-test/patches/innodb_lock_wait_timeout.diff
---- innodb_plugin-1.0.4_orig/mysql-test/patches/innodb_lock_wait_timeout.diff	2009-01-28 15:21:44.000000000 +0900
-+++ innodb_plugin-1.0.4_tmp/mysql-test/patches/innodb_lock_wait_timeout.diff	2009-09-07 17:06:06.000000000 +0900
-@@ -1,5 +1,5 @@
----- mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test.orig	2008-08-04 09:28:16.000000000 +0300
--+++ mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test	2008-10-07 11:14:15.000000000 +0300
-+--- mysql-test/t/innodb_lock_wait_timeout_basic.test	2008-08-04 09:28:16.000000000 +0300
-++++ mysql-test/t/innodb_lock_wait_timeout_basic.test	2008-10-07 11:14:15.000000000 +0300
- @@ -37,10 +37,6 @@
-  #   Check if Value can set                                         #
-  ####################################################################
-@@ -25,8 +25,8 @@
-  
-  SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
-  --echo 1 Expected
----- mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result.orig	2008-08-04 09:27:50.000000000 +0300
--+++ mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result	2008-10-07 11:15:14.000000000 +0300
-+--- mysql-test/r/innodb_lock_wait_timeout_basic.result	2008-08-04 09:27:50.000000000 +0300
-++++ mysql-test/r/innodb_lock_wait_timeout_basic.result	2008-10-07 11:15:14.000000000 +0300
- @@ -4,9 +4,6 @@
-  1
-  1 Expected
-diff -ruN innodb_plugin-1.0.4_orig/mysql-test/patches/innodb_thread_concurrency_basic.diff innodb_plugin-1.0.4_tmp/mysql-test/patches/innodb_thread_concurrency_basic.diff
---- innodb_plugin-1.0.4_orig/mysql-test/patches/innodb_thread_concurrency_basic.diff	2009-02-13 00:38:27.000000000 +0900
-+++ innodb_plugin-1.0.4_tmp/mysql-test/patches/innodb_thread_concurrency_basic.diff	2009-09-07 17:06:06.000000000 +0900
-@@ -1,5 +1,5 @@
----- mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result.orig	2008-12-04 18:45:52 -06:00
--+++ mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result	2009-02-12 02:05:48 -06:00
-+--- mysql-test/r/innodb_thread_concurrency_basic.result	2008-12-04 18:45:52 -06:00
-++++ mysql-test/r/innodb_thread_concurrency_basic.result	2009-02-12 02:05:48 -06:00
- @@ -1,19 +1,19 @@
-  SET @global_start_value = @@global.innodb_thread_concurrency;
-  SELECT @global_start_value;