Merge lp:~tsarev/percona-server/quilt-5.5-2 into lp:~stewart/percona-server/quilt-5.5

[Oleg Tsarev]

1. patches/innodb_bug60788.patch: fix offsets
2. patches/innodb_extend_slow.patch: fix offsets
3. patches/innodb_fix_misc.patch: fix offsets
4. patches/innodb_lru_dump_restore.patch: updated on 'quilt refresh'
5. patches/innodb_recovery_patches.patch: fix offsets
6. patches/innodb_split_buf_pool_mutex.patch: updated on 'quilt refresh'
7. patches/innodb_stats.patch: updated on 'quilt refresh'
8. patches/processlist_row_stats.patch: fix offsets
9. patches/response-time-distribution.patch: fix offsets
10. patches/slow_extended.patch: updated on 'quilt refresh'
11. patches/start-stop-messages.patch: fix offsets
12. patches/userstat.patch: fix offsets
13. update all patches: remove timestamp from header
14. update all patches: remove "diff -ruN a/... b/..." - this is not good, but not found solution for this yet.

1. patches/innodb_bug60788.patch: fix offsets
2. patches/innodb_extend_slow.patch: fix offsets
3. patches/innodb_fix_misc.patch: fix offsets
4. patches/innodb_lru_dump_restore.patch: updated on 'quilt refresh'
5. patches/innodb_recovery_patches.patch: fix offsets
6. patches/innodb_split_buf_pool_mutex.patch: updated on 'quilt refresh'
7. patches/innodb_stats.patch: updated on 'quilt refresh'
8. patches/processlist_row_stats.patch: fix offsets
9. patches/response-time-distribution.patch: fix offsets
10. patches/slow_extended.patch: updated on 'quilt refresh'
11. patches/start-stop-messages.patch: fix offsets
12. patches/userstat.patch: fix offsets
13. update all patches: remove timestamp from header
14. update all patches: remove "diff -ruN a/... b/..." - this is not good, but not found solution for this yet.

[Oleg Tsarev (tsarev)]

I checked correctness by following way:

rm -rf a b
bzr update -r 143
make clean && make all && mv Percona-Server-5.5.13-rel20.4 a
bzr update -r 144
make clean && make all && mv Percona-Server-5.5.13-rel20.4 b
diff -ruN a b # nothing to output

[Yasufumi Kinoshita (yasufumi-kinoshita)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

LGTM

review: Approve

[Stewart Smith (stewart)]

i've done this pretty much anyway, so we don't need this branch.

Unmerged revisions

144. By Oleg Tsarev on 2011-07-27

1. patches/innodb_bug60788.patch: fix offsets
2. patches/innodb_extend_slow.patch: fix offsets
3. patches/innodb_fix_misc.patch: fix offsets
4. patches/innodb_lru_dump_restore.patch: updated on 'quilt refresh'
5. patches/innodb_recovery_patches.patch: fix offsets
6. patches/innodb_split_buf_pool_mutex.patch: updated on 'quilt refresh'
7. patches/innodb_stats.patch: updated on 'quilt refresh'
8. patches/processlist_row_stats.patch: fix offsets
9. patches/response-time-distribution.patch: fix offsets
10. patches/slow_extended.patch: updated on 'quilt refresh'
11. patches/start-stop-messages.patch: fix offsets
12. patches/userstat.patch: fix offsets
13. update all patches: remove timestamp from header
14. update all patches: remove "diff -ruN a/... b/..." - this is not good, but not found solution for this yet.

143. By Oleg Tsarev on 2011-07-27

1. Makefile:
  * add symlink to quiltrc to $(PERCONA_SERVER) dir
  * split "main" target to "prepare" and "main" (prepare just unpack source code and setup for patch appling, main also apply patches)
  * add target "regenerate" (old normalize_patches.sh) (requires for future porting to new mysql version)
  * fix "clean" target
2. apply_patches:
  * fix usages: "--quiltrc=quiltrc"
  * now uses sh instead of bash
3. install_tests:
  * rename to install_tests from install_tests.sh
  * fix path to series
4. normalize_patches:
  * rename to normalize_patches from normalize_patches.sh
  * now use quilt for regenerate patches
5. quiltrc:
  * add QUILT_[REFRESH|DIFF|PATCH]_[ARGS|OPTS] options
6. regenerate_patch.sh:
  * removed (unecessary now)

142. By Stewart Smith on 2011-07-25

add back in applying of handlersocket patch, was accidently removed

141. By Stewart Smith on 2011-07-22

move to using quilt for patch management. also has fallback to piping patches to patch for systems without quilt installed

140. By Stewart Smith on 2011-07-21

merge FEDERATED bug fix of not clearing errors on close

139. By Stewart Smith on 2011-07-21

merge bug745241

138. By Alexey Kopytov on 2011-07-14

Merge from LP.

137. By Alexey Kopytov on 2011-07-06

Bug #745241: quering global_temporary_tables causes server crash

The problem was in an insufficient locking in
fill_global_temporary_tables(). Iterating thread's temporary_tables list
could lead to race conditions, because other server code assumes that
list to only be accessed by a single (the current) thread at any time.

Fixed by introducing a new mutex in THD protecting the temporary_tables
list and acquiring that mutex when modifying the list or in
fill_global_temporary_tables().

136. By Stewart Smith on 2011-06-30

merge fdatasync() usage for innodb log files

135. By Stewart Smith on 2011-06-28

merge bug 802829 fix

=== modified file 'patches/bug580324.patch'
--- patches/bug580324.patch	2011-07-22 16:56:42 +0000
+++ patches/bug580324.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc
---- a/sql/sql_base.cc	2011-04-09 18:49:00.000000000 +0400
-+++ b/sql/sql_base.cc	2011-04-09 18:49:02.000000000 +0400
+--- a/sql/sql_base.cc
++++ b/sql/sql_base.cc
 @@ -251,8 +251,12 @@
                            const TABLE_LIST *table_list,
                            bool tmp_table)
@@ -23,9 +22,8 @@
    if (tmp_table)
    {
      int4store(key + key_length, thd->server_id);
-diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc	2011-04-09 18:49:00.000000000 +0400
-+++ b/sql/sql_parse.cc	2011-04-09 18:49:02.000000000 +0400
+--- a/sql/sql_parse.cc
++++ b/sql/sql_parse.cc
 @@ -1112,11 +1112,18 @@
      break;
  #else
@@ -93,9 +91,8 @@
      thd->set_query(fields, query_length);
      general_log_print(thd, command, "%s %s", table_list.table_name, fields);
  
-diff -ruN a/strings/ctype-utf8.c b/strings/ctype-utf8.c
---- a/strings/ctype-utf8.c	2011-04-09 18:48:03.000000000 +0400
-+++ b/strings/ctype-utf8.c	2011-04-09 18:49:02.000000000 +0400
+--- a/strings/ctype-utf8.c
++++ b/strings/ctype-utf8.c
 @@ -4212,6 +4212,10 @@
  {
    int code;
 
=== modified file 'patches/bug813587.patch'
--- patches/bug813587.patch	2011-07-22 16:56:42 +0000
+++ patches/bug813587.patch	2011-07-27 11:32:35 +0000
@@ -6,10 +6,9 @@
 # Clear MySQL connection errors in ha_federated::close(), since they
 # can affect queries on other tables due to table cache eviction.
 #
-diff -ruN Percona-Server.orig/storage/federated/ha_federated.cc Percona-Server/storage/federated/ha_federated.cc
---- Percona-Server.orig/storage/federated/ha_federated.cc	2011-05-11 15:54:12.000000000 +0400
-+++ Percona-Server/storage/federated/ha_federated.cc	2011-07-21 13:07:30.000000000 +0400
-@@ -1675,6 +1675,8 @@ int ha_federated::open(const char *name,
+--- a/storage/federated/ha_federated.cc
++++ b/storage/federated/ha_federated.cc
+@@ -1675,6 +1675,8 @@
  
  int ha_federated::close(void)
  {
@@ -18,7 +17,7 @@
    DBUG_ENTER("ha_federated::close");
  
    free_result();
-@@ -1685,6 +1687,10 @@ int ha_federated::close(void)
+@@ -1685,6 +1687,10 @@
    mysql_close(mysql);
    mysql= NULL;
  
 
=== modified file 'patches/control_online_alter_index.patch'
--- patches/control_online_alter_index.patch	2011-07-22 16:56:42 +0000
+++ patches/control_online_alter_index.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/sql/handler.h b/sql/handler.h
---- a/sql/handler.h	2010-11-03 07:01:14.000000000 +0900
-+++ b/sql/handler.h	2010-12-03 13:51:04.727293058 +0900
+--- a/sql/handler.h
++++ b/sql/handler.h
 @@ -205,6 +205,8 @@
  #define HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE      (1L << 9)
  #define HA_INPLACE_ADD_PK_INDEX_NO_WRITE           (1L << 10)
@@ -17,9 +16,8 @@
  /*
    HA_PARTITION_FUNCTION_SUPPORTED indicates that the function is
    supported at all.
-diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h	2010-12-02 20:31:56.200956501 +0900
-+++ b/sql/sql_class.h	2010-12-03 13:51:04.744953174 +0900
+--- a/sql/sql_class.h
++++ b/sql/sql_class.h
 @@ -481,6 +481,8 @@
    my_bool engine_condition_pushdown;
    my_bool keep_files_on_create;
@@ -29,9 +27,8 @@
    my_bool old_alter_table;
    my_bool old_passwords;
    my_bool big_tables;
-diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc
---- a/sql/sql_partition.cc	2010-11-03 07:01:14.000000000 +0900
-+++ b/sql/sql_partition.cc	2010-12-03 13:59:56.444039002 +0900
+--- a/sql/sql_partition.cc
++++ b/sql/sql_partition.cc
 @@ -4636,7 +4636,12 @@
          alter_info->num_parts= curr_part_no - new_part_no;
        }
@@ -46,9 +43,8 @@
      {
        my_error(ER_PARTITION_FUNCTION_FAILURE, MYF(0));
        goto err;
-diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
---- a/sql/sql_table.cc	2010-11-03 07:01:14.000000000 +0900
-+++ b/sql/sql_table.cc	2010-12-03 13:51:04.768955495 +0900
+--- a/sql/sql_table.cc
++++ b/sql/sql_table.cc
 @@ -6112,6 +6112,10 @@
      uint  *idx_end_p;
  
@@ -60,9 +56,8 @@
      DBUG_PRINT("info", ("alter_flags: %lu", alter_flags));
      /* Check dropped indexes. */
      for (idx_p= index_drop_buffer, idx_end_p= idx_p + index_drop_count;
-diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc
---- a/sql/sys_vars.cc	2010-12-02 21:23:05.569356468 +0900
-+++ b/sql/sys_vars.cc	2010-12-03 14:05:28.857356603 +0900
+--- a/sql/sys_vars.cc
++++ b/sql/sys_vars.cc
 @@ -2186,6 +2186,13 @@
         GLOBAL_VAR(opt_optimizer_fix),
         NO_CMD_LINE, DEFAULT(TRUE));
 
=== modified file 'patches/error_pad.patch'
--- patches/error_pad.patch	2011-07-22 16:56:42 +0000
+++ patches/error_pad.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/extra/comp_err.c b/extra/comp_err.c
---- a/extra/comp_err.c	2011-04-09 18:48:04.000000000 +0400
-+++ b/extra/comp_err.c	2011-04-09 18:48:56.000000000 +0400
+--- a/extra/comp_err.c
++++ b/extra/comp_err.c
 @@ -30,11 +30,12 @@
  #include <assert.h>
  #include <my_dir.h>
 
=== modified file 'patches/file-contents.patch'
--- patches/file-contents.patch	2011-07-22 16:56:42 +0000
+++ patches/file-contents.patch	2011-07-27 11:32:35 +0000
@@ -1,6 +1,6 @@
 --- a/mysql-test/t/file_contents.test
 +++ b/mysql-test/t/file_contents.test
-@@ -20,7 +20,7 @@ if ($dir_bin =~ m|/usr/|) {
+@@ -20,7 +20,7 @@
      $dir_docs = "$dir_docs/packages/MySQL-server";
    } else {
      # RedHat: version number in directory name
@@ -9,7 +9,7 @@
    }
  } elsif ($dir_bin =~ m|/usr$|) {
    # RPM build during development
-@@ -28,9 +28,12 @@ if ($dir_bin =~ m|/usr/|) {
+@@ -28,9 +28,12 @@
    if(-d "$dir_docs/packages/MySQL-server") {
      # SuSE
      $dir_docs = "$dir_docs/packages/MySQL-server";
 
=== modified file 'patches/innodb_adaptive_hash_index_partitions.patch'
--- patches/innodb_adaptive_hash_index_partitions.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_adaptive_hash_index_partitions.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
---- a/storage/innobase/btr/btr0btr.c	2010-12-04 15:52:23.355483176 +0900
-+++ b/storage/innobase/btr/btr0btr.c	2010-12-04 16:12:48.639514256 +0900
+--- a/storage/innobase/btr/btr0btr.c
++++ b/storage/innobase/btr/btr0btr.c
 @@ -1518,7 +1518,7 @@
  	}
  	ut_a(block);
@@ -80,9 +79,8 @@
  
  	if (left_page_no == FIL_NULL && !page_is_leaf(page)) {
  
-diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
---- a/storage/innobase/btr/btr0cur.c	2010-12-04 15:52:23.359513820 +0900
-+++ b/storage/innobase/btr/btr0cur.c	2010-12-04 16:12:48.643551837 +0900
+--- a/storage/innobase/btr/btr0cur.c
++++ b/storage/innobase/btr/btr0cur.c
 @@ -498,7 +498,7 @@
  #ifdef UNIV_SEARCH_PERF_STAT
  	info->n_searches++;
@@ -162,9 +160,8 @@
  	}
  
  	btr_cur_del_mark_set_sec_rec_log(rec, val, mtr);
-diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
---- a/storage/innobase/btr/btr0sea.c	2010-12-04 15:52:23.387513429 +0900
-+++ b/storage/innobase/btr/btr0sea.c	2010-12-04 16:14:51.721884049 +0900
+--- a/storage/innobase/btr/btr0sea.c
++++ b/storage/innobase/btr/btr0sea.c
 @@ -48,6 +48,8 @@
  UNIV_INTERN char		btr_search_enabled	= TRUE;
  UNIV_INTERN ibool		btr_search_fully_disabled = FALSE;
@@ -961,9 +958,8 @@
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
  	}
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-04 15:55:21.351597052 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-04 16:12:48.654550708 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -949,6 +949,7 @@
  
  	block->check_index_page_at_flush = FALSE;
@@ -1016,9 +1012,8 @@
  
  	block->n_hash_helps	= 0;
  	block->is_hashed	= FALSE;
-diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
---- a/storage/innobase/buf/buf0lru.c	2010-12-04 15:35:29.137347521 +0900
-+++ b/storage/innobase/buf/buf0lru.c	2010-12-04 16:12:48.658550840 +0900
+--- a/storage/innobase/buf/buf0lru.c
++++ b/storage/innobase/buf/buf0lru.c
 @@ -1798,7 +1798,7 @@
  
  		UNIV_MEM_VALID(((buf_block_t*) bpage)->frame,
@@ -1028,9 +1023,8 @@
  		UNIV_MEM_INVALID(((buf_block_t*) bpage)->frame,
  				 UNIV_PAGE_SIZE);
  
-diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
---- a/storage/innobase/dict/dict0dict.c	2010-12-04 15:52:23.398513916 +0900
-+++ b/storage/innobase/dict/dict0dict.c	2010-12-04 16:12:48.662550715 +0900
+--- a/storage/innobase/dict/dict0dict.c
++++ b/storage/innobase/dict/dict0dict.c
 @@ -1811,7 +1811,7 @@
  	zero. */
  
@@ -1040,9 +1034,8 @@
  		if (ref_count == 0) {
  			break;
  		}
-diff -ruN a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c
---- a/storage/innobase/ha/ha0ha.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/ha/ha0ha.c	2010-12-04 16:12:48.665593752 +0900
+--- a/storage/innobase/ha/ha0ha.c
++++ b/storage/innobase/ha/ha0ha.c
 @@ -102,7 +102,8 @@
  	ut_ad(table);
  	ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
@@ -1053,9 +1046,8 @@
  #endif /* UNIV_SYNC_DEBUG */
  
  #ifndef UNIV_HOTBACKUP
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:12:20.185850734 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:12:48.674552412 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -11702,6 +11702,11 @@
    "Disable with --skip-innodb-adaptive-hash-index.",
    NULL, innodb_adaptive_hash_index_update, TRUE);
@@ -1076,9 +1068,8 @@
    MYSQL_SYSVAR(stats_method),
    MYSQL_SYSVAR(replication_delay),
    MYSQL_SYSVAR(status_file),
-diff -ruN a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
---- a/storage/innobase/include/btr0sea.h	2010-12-03 15:48:03.070987226 +0900
-+++ b/storage/innobase/include/btr0sea.h	2010-12-04 16:12:48.707551382 +0900
+--- a/storage/innobase/include/btr0sea.h
++++ b/storage/innobase/include/btr0sea.h
 @@ -85,7 +85,8 @@
  ulint
  btr_search_info_get_ref_count(
@@ -1174,9 +1165,8 @@
  
  #ifdef UNIV_SEARCH_PERF_STAT
  /** Number of successful adaptive hash index lookups */
-diff -ruN a/storage/innobase/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic
---- a/storage/innobase/include/btr0sea.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/btr0sea.ic	2010-12-04 16:12:48.709511202 +0900
+--- a/storage/innobase/include/btr0sea.ic
++++ b/storage/innobase/include/btr0sea.ic
 @@ -62,8 +62,8 @@
  	btr_search_t*	info;
  
@@ -1261,9 +1251,8 @@
 +	}
 +}
 +
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2010-12-15 19:00:07.713604580 +0900
-+++ b/storage/innobase/include/buf0buf.h	2010-12-15 20:58:03.546839883 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -1546,7 +1546,7 @@
  					pointers in the adaptive hash index
  					pointing to this frame */
@@ -1281,9 +1270,8 @@
  	/* @} */
  # ifdef UNIV_SYNC_DEBUG
  	/** @name Debug fields */
-diff -ruN a/storage/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic
---- a/storage/innobase/include/row0upd.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/row0upd.ic	2010-12-04 16:12:48.710551113 +0900
+--- a/storage/innobase/include/row0upd.ic
++++ b/storage/innobase/include/row0upd.ic
 @@ -158,7 +158,7 @@
  	ut_ad(dict_index_is_clust(index));
  	ut_ad(rec_offs_validate(rec, index, offsets));
@@ -1293,9 +1281,8 @@
  		ut_ad(!buf_block_align(rec)->is_hashed);
  	}
  #endif /* UNIV_SYNC_DEBUG */
-diff -ruN a/storage/innobase/page/page0page.c b/storage/innobase/page/page0page.c
---- a/storage/innobase/page/page0page.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/page/page0page.c	2010-12-04 16:12:48.712550963 +0900
+--- a/storage/innobase/page/page0page.c
++++ b/storage/innobase/page/page0page.c
 @@ -218,7 +218,7 @@
  	const ibool	is_hashed	= block->is_hashed;
  
@@ -1314,9 +1301,8 @@
  	}
  #endif /* !UNIV_HOTBACKUP */
  }
-diff -ruN a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c
---- a/storage/innobase/page/page0zip.c	2010-12-04 15:57:13.061494433 +0900
-+++ b/storage/innobase/page/page0zip.c	2010-12-04 16:12:48.716470334 +0900
+--- a/storage/innobase/page/page0zip.c
++++ b/storage/innobase/page/page0zip.c
 @@ -4444,7 +4444,7 @@
  
  #ifndef UNIV_HOTBACKUP
@@ -1326,9 +1312,8 @@
  	block->check_index_page_at_flush = TRUE;
  #else /* !UNIV_HOTBACKUP */
  	ut_ad(block == back_block1);
-diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
---- a/storage/innobase/row/row0sel.c	2010-12-04 16:09:53.204513572 +0900
-+++ b/storage/innobase/row/row0sel.c	2010-12-04 16:12:48.722551273 +0900
+--- a/storage/innobase/row/row0sel.c
++++ b/storage/innobase/row/row0sel.c
 @@ -1210,7 +1210,7 @@
  	ut_ad(plan->unique_search);
  	ut_ad(!plan->must_get_clust);
@@ -1486,9 +1471,8 @@
  		trx->has_search_latch = FALSE;
  	}
  
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-04 16:12:20.231484679 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-04 16:12:48.726551018 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -2045,7 +2045,9 @@
  	      "-------------------------------------\n", file);
  	ibuf_print(file);
@@ -1533,9 +1517,8 @@
  			(ulong) btr_search_sys_subtotal,
  
  			(ulong) (buf_pool_from_array(0)->page_hash->n_cells * sizeof(hash_cell_t)),
-diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
---- a/storage/innobase/sync/sync0sync.c	2010-12-03 17:36:44.300986571 +0900
-+++ b/storage/innobase/sync/sync0sync.c	2010-12-04 16:12:48.729513564 +0900
+--- a/storage/innobase/sync/sync0sync.c
++++ b/storage/innobase/sync/sync0sync.c
 @@ -1223,7 +1223,6 @@
  	case SYNC_OUTER_ANY_LATCH:
  	case SYNC_FILE_FORMAT_TAG:
@@ -1552,9 +1535,8 @@
  	case SYNC_BUF_LRU_LIST:
  	case SYNC_BUF_FLUSH_LIST:
  	case SYNC_BUF_PAGE_HASH:
-diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
---- a/storage/innobase/trx/trx0trx.c	2010-12-03 17:49:11.623953784 +0900
-+++ b/storage/innobase/trx/trx0trx.c	2010-12-04 16:12:48.731513275 +0900
+--- a/storage/innobase/trx/trx0trx.c
++++ b/storage/innobase/trx/trx0trx.c
 @@ -265,8 +265,14 @@
  /*=================================*/
  	trx_t*	   trx) /*!< in: transaction */
 
=== modified file 'patches/innodb_admin_command_base.patch'
--- patches/innodb_admin_command_base.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_admin_command_base.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:32:15.624039043 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:32:35.424957827 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -11863,7 +11863,8 @@
  i_s_innodb_sys_foreign_cols,
  i_s_innodb_sys_stats,
@@ -18,9 +17,8 @@
  mysql_declare_plugin_end;
  
  /** @brief Initialize the default value of innodb_commit_concurrency.
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc	2010-12-03 17:30:16.299955549 +0900
-+++ b/storage/innobase/handler/i_s.cc	2010-12-03 17:32:35.425989972 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -4177,3 +4177,139 @@
  	STRUCT_FLD(system_vars, NULL),
  	STRUCT_FLD(__reserved1, NULL)
@@ -161,9 +159,8 @@
 +	STRUCT_FLD(system_vars, NULL),
 +	STRUCT_FLD(__reserved1, NULL)
 +};
-diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
---- a/storage/innobase/handler/i_s.h	2010-12-03 17:30:16.301987692 +0900
-+++ b/storage/innobase/handler/i_s.h	2010-12-03 17:32:35.426954555 +0900
+--- a/storage/innobase/handler/i_s.h
++++ b/storage/innobase/handler/i_s.h
 @@ -46,5 +46,6 @@
  extern struct st_mysql_plugin	i_s_innodb_sys_stats;
  extern struct st_mysql_plugin	i_s_innodb_table_stats;
 
=== modified file 'patches/innodb_buffer_pool_pages_i_s.patch'
--- patches/innodb_buffer_pool_pages_i_s.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_buffer_pool_pages_i_s.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-04 20:20:44.595483291 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-06 19:28:04.055227506 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -4560,6 +4560,36 @@
  	mutex_exit(block_mutex);
  }
@@ -45,9 +44,8 @@
  /*********************************************************************//**
  Asserts that all file pages in the buffer are in a replaceable state.
  @return	TRUE */
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 20:20:44.614551139 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-06 19:23:47.622195800 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -12148,6 +12148,9 @@
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
@@ -58,9 +56,8 @@
  i_s_innodb_admin_command
  mysql_declare_plugin_end;
  
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc	2010-12-04 19:46:39.786513783 +0900
-+++ b/storage/innobase/handler/i_s.cc	2010-12-06 19:28:52.270226921 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -51,6 +51,7 @@
  #include "trx0sys.h" /* for trx_sys */
  #include "dict0dict.h" /* for dict_sys */
@@ -771,9 +768,8 @@
 +	STRUCT_FLD(__reserved1, NULL)
 +};
 +
-diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
---- a/storage/innobase/handler/i_s.h	2010-12-04 19:46:39.657513849 +0900
-+++ b/storage/innobase/handler/i_s.h	2010-12-06 19:23:47.635192988 +0900
+--- a/storage/innobase/handler/i_s.h
++++ b/storage/innobase/handler/i_s.h
 @@ -47,5 +47,8 @@
  extern struct st_mysql_plugin	i_s_innodb_table_stats;
  extern struct st_mysql_plugin	i_s_innodb_index_stats;
@@ -783,9 +779,8 @@
 +extern struct st_mysql_plugin	i_s_innodb_buffer_pool_pages_blob;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2010-12-04 19:46:40.197471531 +0900
-+++ b/storage/innobase/include/buf0buf.h	2010-12-06 19:23:47.638195824 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -1144,6 +1144,14 @@
  /*===========*/
  	const buf_pool_t*	buf_pool)	/*!< in: buffer pool */
 
=== modified file 'patches/innodb_buffer_pool_shm.patch'
--- patches/innodb_buffer_pool_shm.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_buffer_pool_shm.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2011-04-09 18:48:47.000000000 +0400
-+++ b/storage/innobase/buf/buf0buf.c	2011-04-09 18:48:48.000000000 +0400
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -1006,10 +1006,12 @@
  	buf_block_t*	block;
  	byte*		frame;
@@ -32,9 +31,8 @@
  	/* Init block structs and assign frames for them. Then we
  	assign the frames to the first blocks (we already mapped the
  	memory above). */
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2011-04-09 18:48:47.000000000 +0400
-+++ b/storage/innobase/handler/ha_innodb.cc	2011-04-09 18:48:48.000000000 +0400
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -194,6 +194,8 @@
  static my_bool	innobase_create_status_file		= FALSE;
  static my_bool	innobase_stats_on_metadata		= TRUE;
 
=== modified file 'patches/innodb_bug60788.patch'
--- patches/innodb_bug60788.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_bug60788.patch	2011-07-27 11:32:35 +0000
@@ -7,10 +7,9 @@
 # Changes InnoDB IO code so that fsync(), pread() and pwrite() are restarted
 # when interrupted by a signal.
 #
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
---- a/storage/innobase/os/os0file.c	2011-04-20 12:09:57.000000000 +0400
-+++ b/storage/innobase/os/os0file.c	2011-04-20 12:10:04.000000000 +0400
-@@ -2092,6 +2092,9 @@
+--- a/storage/innobase/os/os0file.c
++++ b/storage/innobase/os/os0file.c
+@@ -2093,6 +2093,9 @@
  			failures++;
  
  			retry = TRUE;
@@ -20,7 +19,7 @@
  		} else {
  
  			retry = FALSE;
-@@ -2222,6 +2225,7 @@
+@@ -2223,6 +2226,7 @@
  	off_t	offs;
  #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
  	ssize_t	n_bytes;
@@ -28,7 +27,7 @@
  #endif /* HAVE_PREAD && !HAVE_BROKEN_PREAD */
  	ulint		sec;
  	ulint		ms;
-@@ -2262,7 +2266,18 @@
+@@ -2263,7 +2267,18 @@
  	os_n_pending_reads++;
  	os_mutex_exit(os_file_count_mutex);
  
@@ -48,7 +47,7 @@
  
  	os_mutex_enter(os_file_count_mutex);
  	os_file_n_pending_preads--;
-@@ -2281,6 +2296,7 @@
+@@ -2282,6 +2297,7 @@
  	{
  		off_t	ret_offset;
  		ssize_t	ret;
@@ -56,7 +55,7 @@
  #ifndef UNIV_HOTBACKUP
  		ulint	i;
  #endif /* !UNIV_HOTBACKUP */
-@@ -2301,7 +2317,17 @@
+@@ -2302,7 +2318,17 @@
  		if (ret_offset < 0) {
  			ret = -1;
  		} else {
@@ -75,7 +74,7 @@
  		}
  
  #ifndef UNIV_HOTBACKUP
-@@ -2340,6 +2366,7 @@
+@@ -2341,6 +2367,7 @@
  				offset */
  {
  	ssize_t	ret;
@@ -83,7 +82,7 @@
  	off_t	offs;
  
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
-@@ -2367,7 +2394,18 @@
+@@ -2368,7 +2395,18 @@
  	os_n_pending_writes++;
  	os_mutex_exit(os_file_count_mutex);
  
@@ -103,7 +102,7 @@
  
  	os_mutex_enter(os_file_count_mutex);
  	os_file_n_pending_pwrites--;
-@@ -2414,7 +2452,17 @@
+@@ -2415,7 +2453,17 @@
  			goto func_exit;
  		}
  
 
=== modified file 'patches/innodb_deadlock_count.patch'
--- patches/innodb_deadlock_count.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_deadlock_count.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:09:53.145500265 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:10:24.605515894 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -686,6 +686,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,	  SHOW_LONG},
    {"dblwr_writes",
@@ -17,9 +16,8 @@
    {"dict_tables",
    (char*) &export_vars.innodb_dict_tables,		  SHOW_LONG},
    {"have_atomic_builtins",
-diff -ruN a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
---- a/storage/innobase/include/lock0lock.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/lock0lock.h	2010-12-04 16:10:24.605515894 +0900
+--- a/storage/innobase/include/lock0lock.h
++++ b/storage/innobase/include/lock0lock.h
 @@ -43,6 +43,7 @@
  #endif /* UNIV_DEBUG */
  /* Buffer for storing information about the most recent deadlock error */
@@ -28,9 +26,8 @@
  
  /*********************************************************************//**
  Gets the size of a lock struct.
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-04 15:55:21.378480843 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-04 16:10:24.606550983 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -758,6 +758,7 @@
  	ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
  	ulint innodb_dblwr_pages_written;	/*!< srv_dblwr_pages_written */
@@ -39,9 +36,8 @@
  	ibool innodb_have_atomic_builtins;	/*!< HAVE_ATOMIC_BUILTINS */
  	ulint innodb_log_waits;			/*!< srv_log_waits */
  	ulint innodb_log_write_requests;	/*!< srv_log_write_requests */
-diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
---- a/storage/innobase/lock/lock0lock.c	2010-12-03 17:49:11.609953956 +0900
-+++ b/storage/innobase/lock/lock0lock.c	2010-12-04 16:10:24.608513889 +0900
+--- a/storage/innobase/lock/lock0lock.c
++++ b/storage/innobase/lock/lock0lock.c
 @@ -3328,6 +3328,7 @@
  		break;
  
@@ -50,9 +46,8 @@
  		fputs("*** WE ROLL BACK TRANSACTION (2)\n",
  		      lock_latest_err_file);
  		break;
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-04 15:57:13.069513371 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-04 16:10:24.610593039 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -468,6 +468,7 @@
  static ulint	srv_n_rows_deleted_old		= 0;
  static ulint	srv_n_rows_read_old		= 0;
 
=== modified file 'patches/innodb_dict_size_limit.patch'
--- patches/innodb_dict_size_limit.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_dict_size_limit.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
---- a/storage/innobase/btr/btr0sea.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/btr/btr0sea.c	2010-12-03 15:45:47.503988924 +0900
+--- a/storage/innobase/btr/btr0sea.c
++++ b/storage/innobase/btr/btr0sea.c
 @@ -1185,6 +1185,179 @@
  	mem_free(folds);
  }
@@ -188,9 +187,8 @@
  /********************************************************************//**
  Drops a page hash index when a page is freed from a fseg to the file system.
  Drops possible hash index if the page happens to be in the buffer pool. */
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2011-02-01 18:00:03.000000000 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2011-02-01 18:01:59.000000000 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -294,14 +294,14 @@
  # endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */
  #endif /* UNIV_PFS_MUTEX || UNIV_PFS_RWLOCK */
@@ -214,9 +212,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  /********************************************************************//**
-diff -ruN a/storage/innobase/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c
---- a/storage/innobase/dict/dict0boot.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/dict/dict0boot.c	2010-12-03 15:45:47.503988924 +0900
+--- a/storage/innobase/dict/dict0boot.c
++++ b/storage/innobase/dict/dict0boot.c
 @@ -284,6 +284,7 @@
  	system tables */
  	/*-------------------------*/
@@ -249,9 +246,8 @@
  
  	dict_mem_table_add_col(table, heap, "INDEX_ID", DATA_BINARY, 0, 0);
  	dict_mem_table_add_col(table, heap, "POS", DATA_INT, 0, 4);
-diff -ruN a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c
---- a/storage/innobase/dict/dict0crea.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/dict/dict0crea.c	2010-12-03 15:45:47.521955810 +0900
+--- a/storage/innobase/dict/dict0crea.c
++++ b/storage/innobase/dict/dict0crea.c
 @@ -1210,6 +1210,9 @@
  		/* Foreign constraint system tables have already been
  		created, and they are ok */
@@ -274,9 +270,8 @@
  	row_mysql_unlock_data_dictionary(trx);
  
  	trx_free_for_mysql(trx);
-diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
---- a/storage/innobase/dict/dict0dict.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/dict/dict0dict.c	2010-12-03 15:45:47.525953769 +0900
+--- a/storage/innobase/dict/dict0dict.c
++++ b/storage/innobase/dict/dict0dict.c
 @@ -626,6 +626,8 @@
  
  	table = dict_table_get_on_id_low(table_id);
@@ -372,9 +367,8 @@
  	/* We always create search info whether or not adaptive
  	hash index is enabled or not. */
  	info = index->search_info;
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:43:57.294986852 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:45:47.534959966 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -674,6 +674,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,	  SHOW_LONG},
    {"dblwr_writes",
@@ -404,9 +398,8 @@
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(use_native_aio),
    MYSQL_SYSVAR(change_buffering),
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
---- a/storage/innobase/ibuf/ibuf0ibuf.c	2010-12-03 15:18:48.889024455 +0900
-+++ b/storage/innobase/ibuf/ibuf0ibuf.c	2010-12-03 15:45:47.553025057 +0900
+--- a/storage/innobase/ibuf/ibuf0ibuf.c
++++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -566,6 +566,7 @@
  
  	/* Use old-style record format for the insert buffer. */
@@ -415,9 +408,8 @@
  
  	dict_mem_table_add_col(table, heap, "DUMMY_COLUMN", DATA_BINARY, 0, 0);
  
-diff -ruN a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
---- a/storage/innobase/include/btr0sea.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/btr0sea.h	2010-12-03 15:45:47.555024229 +0900
+--- a/storage/innobase/include/btr0sea.h
++++ b/storage/innobase/include/btr0sea.h
 @@ -140,6 +140,13 @@
  				s- or x-latched, or an index page
  				for which we know that
@@ -432,9 +424,8 @@
  /********************************************************************//**
  Drops a page hash index when a page is freed from a fseg to the file system.
  Drops possible hash index if the page happens to be in the buffer pool. */
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2011-02-01 18:00:03.000000000 +0900
-+++ b/storage/innobase/include/buf0buf.h	2011-02-01 18:03:29.000000000 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -1555,6 +1555,15 @@
  #define BUF_POOL_ZIP_FOLD_BPAGE(b) BUF_POOL_ZIP_FOLD((buf_block_t*) (b))
  /* @} */
@@ -451,9 +442,8 @@
  /** @brief The buffer pool statistics structure. */
  struct buf_pool_stat_struct{
  	ulint	n_page_gets;	/*!< number of page gets performed;
-diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
---- a/storage/innobase/include/dict0dict.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/dict0dict.h	2010-12-03 15:45:47.558024515 +0900
+--- a/storage/innobase/include/dict0dict.h
++++ b/storage/innobase/include/dict0dict.h
 @@ -1170,6 +1170,12 @@
  /*====================================*/
  	dict_table_t*	table,	/*!< in: table */
@@ -467,9 +457,8 @@
  /* Buffers for storing detailed information about the latest foreign key
  and unique key errors */
  extern FILE*	dict_foreign_err_file;
-diff -ruN a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic
---- a/storage/innobase/include/dict0dict.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/dict0dict.ic	2010-12-03 15:45:47.560024398 +0900
+--- a/storage/innobase/include/dict0dict.ic
++++ b/storage/innobase/include/dict0dict.ic
 @@ -824,6 +824,13 @@
  	HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold,
  		    dict_table_t*, table, ut_ad(table->cached),
@@ -497,9 +486,8 @@
  	ut_ad(!table || table->cached);
  
  	/* TODO: should get the type information from MySQL */
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-03 15:43:57.297067100 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-03 15:45:47.562024404 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -229,6 +229,7 @@
  extern ulint	srv_read_ahead;
  extern ulint	srv_adaptive_flushing_method;
@@ -516,9 +504,8 @@
  	ulint innodb_buffer_pool_pages_total;	/*!< Buffer pool size */
  	ulint innodb_buffer_pool_pages_data;	/*!< Data pages */
  	ulint innodb_buffer_pool_pages_dirty;	/*!< Dirty data pages */
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 15:43:57.301024390 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 15:45:47.565023830 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -415,6 +415,8 @@
  UNIV_INTERN ulint	srv_enable_unsafe_group_commit = 0; /* 0:disable 1:enable */
  UNIV_INTERN ulint	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
 
=== modified file 'patches/innodb_expand_fast_index_creation.patch'
--- patches/innodb_expand_fast_index_creation.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_expand_fast_index_creation.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 # ALTER TABLE and OPTIMIZE TABLE.
 #
 #
-diff -ruN a/client/client_priv.h b/client/client_priv.h
---- a/client/client_priv.h	2011-04-11 08:57:20.000000000 +0400
-+++ b/client/client_priv.h	2011-04-11 08:57:21.000000000 +0400
+--- a/client/client_priv.h
++++ b/client/client_priv.h
 @@ -90,6 +90,7 @@
    OPT_NO_REMOVE_EOL_CARRET,
    OPT_DEFAULT_AUTH,
@@ -16,9 +15,8 @@
    OPT_MAX_CLIENT_OPTION
  };
  
-diff -ruN a/client/mysqldump.c b/client/mysqldump.c
---- a/client/mysqldump.c	2011-04-11 08:57:17.000000000 +0400
-+++ b/client/mysqldump.c	2011-04-11 08:57:21.000000000 +0400
+--- a/client/mysqldump.c
++++ b/client/mysqldump.c
 @@ -45,6 +45,7 @@
  #include <m_ctype.h>
  #include <hash.h>
@@ -173,9 +171,8 @@
      /* Moved enable keys to before unlock per bug 15977 */
      if (opt_disable_keys)
      {
-diff -ruN /dev/null b/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result	2011-04-11 08:57:21.000000000 +0400
+--- /dev/null
++++ b/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result
 @@ -0,0 +1,109 @@
 +#
 +# Test the --innodb-optimize-keys option.
@@ -286,9 +283,8 @@
 +
 +######################################
 +DROP TABLE t1, t2;
-diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
---- a/mysql-test/suite/innodb/r/innodb.result	2011-03-31 17:36:17.000000000 +0400
-+++ b/mysql-test/suite/innodb/r/innodb.result	2011-04-11 23:26:45.000000000 +0400
+--- a/mysql-test/suite/innodb/r/innodb.result
++++ b/mysql-test/suite/innodb/r/innodb.result
 @@ -1673,7 +1673,7 @@
  71
  SELECT variable_value - @innodb_rows_inserted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_inserted';
@@ -298,9 +294,8 @@
  SELECT variable_value - @innodb_rows_updated_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_updated';
  variable_value - @innodb_rows_updated_orig
  866
-diff -ruN a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
---- a/mysql-test/suite/innodb/t/innodb-index.test	2011-03-31 17:36:17.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb-index.test	2011-04-11 08:57:21.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb-index.test
++++ b/mysql-test/suite/innodb/t/innodb-index.test
 @@ -28,6 +28,11 @@
  show create table t1;
  --error ER_MULTIPLE_PRI_KEY
@@ -313,9 +308,8 @@
  --error ER_DUP_ENTRY
  alter table t1 drop primary key, add primary key (b);
  create unique index c on t1 (c);
-diff -ruN a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
---- a/mysql-test/suite/innodb/t/innodb.test	2011-03-31 17:36:17.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb.test	2011-04-11 08:57:21.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb.test
++++ b/mysql-test/suite/innodb/t/innodb.test
 @@ -21,6 +21,12 @@
  
  -- source include/have_innodb.inc
@@ -329,9 +323,8 @@
  let $MYSQLD_DATADIR= `select @@datadir`;
  
  # Save the original values of some variables in order to be able to
-diff -ruN /dev/null b/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test	2011-04-11 08:57:21.000000000 +0400
+--- /dev/null
++++ b/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test
 @@ -0,0 +1,62 @@
 +# Embedded server doesn't support external clients
 +--source include/not_embedded.inc
@@ -395,9 +388,8 @@
 +
 +# Wait till we reached the initial number of concurrent sessions
 +--source include/wait_until_count_sessions.inc
-diff -ruN a/sql/sql_lex.cc b/sql/sql_lex.cc
---- a/sql/sql_lex.cc	2011-04-11 08:57:17.000000000 +0400
-+++ b/sql/sql_lex.cc	2011-04-11 08:57:21.000000000 +0400
+--- a/sql/sql_lex.cc
++++ b/sql/sql_lex.cc
 @@ -1630,6 +1630,9 @@
    alter_list(rhs.alter_list, mem_root),
    key_list(rhs.key_list, mem_root),
@@ -416,9 +408,8 @@
    /* partition_names are not deeply copied currently */
  }
  
-diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h
---- a/sql/sql_lex.h	2011-04-11 08:57:19.000000000 +0400
-+++ b/sql/sql_lex.h	2011-04-11 08:57:21.000000000 +0400
+--- a/sql/sql_lex.h
++++ b/sql/sql_lex.h
 @@ -1003,6 +1003,9 @@
    List<Alter_column>            alter_list;
    List<Key>                     key_list;
@@ -448,9 +439,8 @@
      flags= 0;
      keys_onoff= LEAVE_AS_IS;
      tablespace_op= NO_TABLESPACE_OP;
-diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
---- a/sql/sql_table.cc	2011-04-11 08:56:57.000000000 +0400
-+++ b/sql/sql_table.cc	2011-04-11 23:30:02.000000000 +0400
+--- a/sql/sql_table.cc
++++ b/sql/sql_table.cc
 @@ -2773,7 +2773,7 @@
        file                      The handler for the new table.
        key_info_buffer     OUT   An array of KEY structs for the indexes.
 
=== modified file 'patches/innodb_expand_import.patch'
--- patches/innodb_expand_import.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_expand_import.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
---- a/storage/innobase/btr/btr0btr.c	2011-04-11 19:44:03.000000000 +0900
-+++ b/storage/innobase/btr/btr0btr.c	2011-05-24 20:30:12.455852287 +0900
+--- a/storage/innobase/btr/btr0btr.c
++++ b/storage/innobase/btr/btr0btr.c
 @@ -837,7 +837,7 @@
  /**************************************************************//**
  Creates a new index page (not the root, and also not
@@ -35,9 +34,8 @@
  void
  btr_attach_half_pages(
  /*==================*/
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-12-03 15:09:51.274957577 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-03 15:52:23.553986552 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -40,6 +40,14 @@
  #include "dict0dict.h"
  #include "page0page.h"
@@ -865,9 +863,8 @@
  	return(success);
  }
  #endif /* !UNIV_HOTBACKUP */
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:49:59.195023983 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:52:23.555957062 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -7377,6 +7377,14 @@
  		err = row_discard_tablespace_for_mysql(dict_table->name, trx);
  	} else {
@@ -903,9 +900,8 @@
    MYSQL_SYSVAR(dict_size_limit),
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(use_native_aio),
-diff -ruN a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h
---- a/storage/innobase/include/btr0btr.h	2011-04-11 19:44:03.000000000 +0900
-+++ b/storage/innobase/include/btr0btr.h	2011-05-24 20:30:12.459853343 +0900
+--- a/storage/innobase/include/btr0btr.h
++++ b/storage/innobase/include/btr0btr.h
 @@ -219,6 +219,17 @@
  @return the uncompressed page frame */
  # define btr_page_get(space,zip_size,page_no,mode,mtr) \
@@ -1018,9 +1014,8 @@
  /****************************************************************//**
  Sets a record as the predefined minimum record. */
  UNIV_INTERN
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-03 15:48:03.077954270 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-03 15:52:23.561986996 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -229,6 +229,8 @@
  extern ulint	srv_read_ahead;
  extern ulint	srv_adaptive_flushing_method;
@@ -1030,9 +1025,8 @@
  extern ulint	srv_dict_size_limit;
  /*-------------------------------------------*/
  
-diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
---- a/storage/innobase/row/row0mysql.c	2011-04-11 19:44:03.000000000 +0900
-+++ b/storage/innobase/row/row0mysql.c	2011-06-06 11:53:18.395764565 +0900
+--- a/storage/innobase/row/row0mysql.c
++++ b/storage/innobase/row/row0mysql.c
 @@ -2568,6 +2568,11 @@
  
  	current_lsn = log_get_lsn();
@@ -1057,9 +1051,8 @@
  	return((int) err);
  }
  
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 15:49:59.230956118 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 15:52:23.562954411 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -416,6 +416,8 @@
  UNIV_INTERN ulint	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
  UNIV_INTERN ulint	srv_adaptive_flushing_method = 0; /* 0: native  1: estimate  2: keep_average */
 
=== modified file 'patches/innodb_extend_slow.patch'
--- patches/innodb_extend_slow.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_extend_slow.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-03 15:49:59.175955882 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-03 17:42:42.074307123 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -51,6 +51,40 @@
  #include "dict0dict.h"
  #include "log0recv.h"
@@ -237,9 +236,8 @@
  	return(TRUE);
  }
  
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2010-12-03 17:32:15.617037263 +0900
-+++ b/storage/innobase/buf/buf0rea.c	2010-12-03 17:42:42.075297193 +0900
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -77,7 +77,8 @@
  			treat the tablespace as dropped; this is a timestamp we
  			use to stop dangling page reads from a tablespace
@@ -332,9 +330,8 @@
  		}
  	}
  
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-12-03 15:53:54.610037199 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-03 17:42:42.079064198 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -4747,7 +4747,7 @@
  				 node->name, node->handle, buf,
  				 offset_low, offset_high,
@@ -373,9 +370,8 @@
  #endif
  	ut_a(ret);
  
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:36:44.293955189 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:42:42.090024586 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -1573,6 +1573,16 @@
  	trx->check_unique_secondary = !thd_test_options(
  		thd, OPTION_RELAXED_UNIQUE_CHECKS);
@@ -452,9 +448,8 @@
  
  		trx->mysql_n_tables_locked = 0;
  		prebuilt->used_in_HANDLER = FALSE;
-diff -ruN a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h
---- a/storage/innobase/include/buf0rea.h	2010-12-03 15:18:48.891024406 +0900
-+++ b/storage/innobase/include/buf0rea.h	2010-12-03 17:42:42.096026873 +0900
+--- a/storage/innobase/include/buf0rea.h
++++ b/storage/innobase/include/buf0rea.h
 @@ -27,6 +27,7 @@
  #define buf0rea_h
  
@@ -483,9 +478,8 @@
  /********************************************************************//**
  Issues read requests for pages which the ibuf module wants to read in, in
  order to contract the insert buffer tree. Technically, this function is like
-diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
---- a/storage/innobase/include/fil0fil.h	2010-12-03 15:09:51.290958543 +0900
-+++ b/storage/innobase/include/fil0fil.h	2010-12-03 17:42:42.097027548 +0900
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
 @@ -611,9 +611,12 @@
  Reads or writes data. This operation is asynchronous (aio).
  @return DB_SUCCESS, or DB_TABLESPACE_DELETED if we are trying to do
@@ -511,9 +505,8 @@
  /**********************************************************************//**
  Waits for an aio operation to complete. This function is used to write the
  handler for completed requests. The aio array of pending requests is divided
-diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
---- a/storage/innobase/include/os0file.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/os0file.h	2010-12-03 17:42:42.100023783 +0900
+--- a/storage/innobase/include/os0file.h
++++ b/storage/innobase/include/os0file.h
 @@ -36,6 +36,7 @@
  #define os0file_h
  
@@ -601,9 +594,8 @@
  /************************************************************************//**
  Wakes up all async i/o threads so that they know to exit themselves in
  shutdown. */
-diff -ruN a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic
---- a/storage/innobase/include/os0file.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/os0file.ic	2010-12-03 17:42:42.102024458 +0900
+--- a/storage/innobase/include/os0file.ic
++++ b/storage/innobase/include/os0file.ic
 @@ -229,6 +229,7 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
@@ -638,9 +630,8 @@
  
  	register_pfs_file_io_end(locker, n);
  
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-03 17:32:15.634987408 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-03 17:42:42.104028644 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -71,6 +71,9 @@
  #define SRV_AUTO_EXTEND_INCREMENT	\
  	(srv_auto_extend_increment * ((1024 * 1024) / UNIV_PAGE_SIZE))
@@ -651,9 +642,8 @@
  /* Mutex for locking srv_monitor_file */
  extern mutex_t	srv_monitor_file_mutex;
  /* Temporary file for innodb monitor output */
-diff -ruN a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
---- a/storage/innobase/include/trx0trx.h	2010-12-03 15:41:52.049372966 +0900
-+++ b/storage/innobase/include/trx0trx.h	2010-12-03 17:42:42.107024532 +0900
+--- a/storage/innobase/include/trx0trx.h
++++ b/storage/innobase/include/trx0trx.h
 @@ -743,6 +743,17 @@
  	/*------------------------------*/
  	char detailed_error[256];	/*!< detailed error message for last
@@ -672,9 +662,8 @@
  };
  
  #define TRX_MAX_N_THREADS	32	/* maximum number of
-diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
---- a/storage/innobase/lock/lock0lock.c	2010-12-03 15:09:51.297986437 +0900
-+++ b/storage/innobase/lock/lock0lock.c	2010-12-03 17:42:42.111024587 +0900
+--- a/storage/innobase/lock/lock0lock.c
++++ b/storage/innobase/lock/lock0lock.c
 @@ -1755,6 +1755,8 @@
  {
  	lock_t*	lock;
@@ -715,9 +704,8 @@
  	trx->que_state = TRX_QUE_LOCK_WAIT;
  	trx->was_chosen_as_deadlock_victim = FALSE;
  	trx->wait_started = time(NULL);
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
---- a/storage/innobase/os/os0file.c	2010-12-03 17:32:15.644024974 +0900
-+++ b/storage/innobase/os/os0file.c	2010-12-03 17:42:42.117023467 +0900
+--- a/storage/innobase/os/os0file.c
++++ b/storage/innobase/os/os0file.c
 @@ -43,6 +43,8 @@
  #include "srv0start.h"
  #include "fil0fil.h"
@@ -727,7 +715,7 @@
  #include "log0recv.h"
  #ifndef UNIV_HOTBACKUP
  # include "os0sync.h"
-@@ -2212,13 +2214,18 @@
+@@ -2213,13 +2215,18 @@
  	ulint		n,	/*!< in: number of bytes to read */
  	ulint		offset,	/*!< in: least significant 32 bits of file
  				offset from where to read */
@@ -747,7 +735,7 @@
  
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  
-@@ -2239,6 +2246,15 @@
+@@ -2240,6 +2247,15 @@
  
  	os_n_file_reads++;
  
@@ -763,7 +751,7 @@
  #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
  	os_mutex_enter(os_file_count_mutex);
  	os_file_n_pending_preads++;
-@@ -2252,6 +2268,13 @@
+@@ -2253,6 +2269,13 @@
  	os_n_pending_reads--;
  	os_mutex_exit(os_file_count_mutex);
  
@@ -777,7 +765,7 @@
  	return(n_bytes);
  #else
  	{
-@@ -2288,6 +2311,13 @@
+@@ -2289,6 +2312,13 @@
  		os_n_pending_reads--;
  		os_mutex_exit(os_file_count_mutex);
  
@@ -791,7 +779,7 @@
  		return(ret);
  	}
  #endif
-@@ -2428,7 +2458,8 @@
+@@ -2429,7 +2459,8 @@
  				offset where to read */
  	ulint		offset_high, /*!< in: most significant 32 bits of
  				offset */
@@ -801,7 +789,7 @@
  {
  #ifdef __WIN__
  	BOOL		ret;
-@@ -2503,7 +2534,7 @@
+@@ -2504,7 +2535,7 @@
  	os_bytes_read_since_printout += n;
  
  try_again:
@@ -810,7 +798,7 @@
  
  	if ((ulint)ret == n) {
  
-@@ -2632,7 +2663,7 @@
+@@ -2633,7 +2664,7 @@
  	os_bytes_read_since_printout += n;
  
  try_again:
@@ -819,7 +807,7 @@
  
  	if ((ulint)ret == n) {
  
-@@ -4026,10 +4057,11 @@
+@@ -4027,10 +4058,11 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
  				OS_AIO_SYNC */
@@ -832,7 +820,7 @@
  {
  	os_aio_array_t*	array;
  	os_aio_slot_t*	slot;
-@@ -4070,8 +4102,8 @@
+@@ -4071,8 +4103,8 @@
  		wait in the Windows case. */
  
  		if (type == OS_FILE_READ) {
@@ -843,7 +831,7 @@
  		}
  
  		ut_a(type == OS_FILE_WRITE);
-@@ -4111,6 +4143,11 @@
+@@ -4112,6 +4144,11 @@
  		array = NULL; /* Eliminate compiler warning */
  	}
  
@@ -855,9 +843,8 @@
  	slot = os_aio_array_reserve_slot(type, array, message1, message2, file,
  					 name, buf, offset, offset_high, n);
  	if (type == OS_FILE_READ) {
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 17:32:15.648024399 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 17:45:05.067023254 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -87,6 +87,9 @@
  #include "mysql/plugin.h"
  #include "mysql/service_thd_wait.h"
@@ -915,9 +902,8 @@
  	os_fast_mutex_lock(&srv_conc_mutex);
  
  	srv_conc_n_waiting_threads--;
-diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
---- a/storage/innobase/trx/trx0trx.c	2010-12-03 15:41:52.053955669 +0900
-+++ b/storage/innobase/trx/trx0trx.c	2010-12-03 17:42:42.127023410 +0900
+--- a/storage/innobase/trx/trx0trx.c
++++ b/storage/innobase/trx/trx0trx.c
 @@ -188,6 +188,15 @@
  	trx->global_read_view = NULL;
  	trx->read_view = NULL;
 
=== modified file 'patches/innodb_extra_rseg.patch'
--- patches/innodb_extra_rseg.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_extra_rseg.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:18:48.879955903 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:22:53.779955671 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -11528,6 +11528,7 @@
    innobase_system_variables, /* system variables */
    NULL /* reserved */
@@ -16,9 +15,8 @@
  i_s_innodb_trx,
  i_s_innodb_locks,
  i_s_innodb_lock_waits,
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc	2010-12-03 15:06:58.742986460 +0900
-+++ b/storage/innobase/handler/i_s.cc	2010-12-03 15:33:08.790070078 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -45,6 +45,8 @@
  #include "srv0start.h" /* for srv_was_started */
  #include "trx0i_s.h"
@@ -195,9 +193,8 @@
 +	/* void* */
 +	STRUCT_FLD(__reserved1, NULL)
 +};
-diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
---- a/storage/innobase/handler/i_s.h	2010-12-03 15:06:58.744953398 +0900
-+++ b/storage/innobase/handler/i_s.h	2010-12-03 15:22:53.783953418 +0900
+--- a/storage/innobase/handler/i_s.h
++++ b/storage/innobase/handler/i_s.h
 @@ -35,5 +35,6 @@
  extern struct st_mysql_plugin	i_s_innodb_cmp_reset;
  extern struct st_mysql_plugin	i_s_innodb_cmpmem;
 
=== modified file 'patches/innodb_fast_checksum.patch'
--- patches/innodb_fast_checksum.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_fast_checksum.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-04 15:52:23.391514910 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-04 15:53:45.013513772 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -511,6 +511,27 @@
  	return(checksum);
  }
@@ -92,9 +91,8 @@
  		(ulong) mach_read_from_4(read_buf + FIL_PAGE_SPACE_OR_CHKSUM),
  		(ulong) mach_read_from_4(read_buf + UNIV_PAGE_SIZE
  					 - FIL_PAGE_END_LSN_OLD_CHKSUM),
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
---- a/storage/innobase/buf/buf0flu.c	2010-12-04 15:37:50.555568346 +0900
-+++ b/storage/innobase/buf/buf0flu.c	2010-12-04 15:53:45.015513917 +0900
+--- a/storage/innobase/buf/buf0flu.c
++++ b/storage/innobase/buf/buf0flu.c
 @@ -1055,7 +1055,9 @@
  
  	mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,
@@ -106,9 +104,8 @@
  			: BUF_NO_CHECKSUM_MAGIC);
  
  	/* We overwrite the first 4 bytes of the end lsn field to store
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-12-04 15:52:23.406513743 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-04 15:53:45.020513800 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -3094,13 +3094,24 @@
  		return(TRUE);
  	}
@@ -146,9 +143,8 @@
  						: BUF_NO_CHECKSUM_MAGIC);
  		mach_write_to_4(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM,
  				srv_use_checksums
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:52:23.420480329 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:53:45.029551892 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -183,6 +183,7 @@
  #endif /* UNIV_LOG_ARCHIVE */
  static my_bool	innobase_use_doublewrite		= TRUE;
@@ -189,9 +185,8 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2010-12-04 15:52:23.458514045 +0900
-+++ b/storage/innobase/include/buf0buf.h	2010-12-04 15:53:45.044514150 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -604,6 +604,11 @@
  buf_calc_page_new_checksum(
  /*=======================*/
@@ -204,9 +199,8 @@
  /********************************************************************//**
  In versions < 4.0.14 and < 4.1.1 there was a bug that the checksum only
  looked at the first few bytes of the page. This calculates that old
-diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
---- a/storage/innobase/include/fil0fil.h	2010-12-04 15:52:23.466513796 +0900
-+++ b/storage/innobase/include/fil0fil.h	2010-12-04 15:53:45.046513558 +0900
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
 @@ -118,6 +118,7 @@
  #define FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID  34 /*!< starting from 4.1.x this
  					contains the space id of the page */
@@ -215,9 +209,8 @@
  /* @} */
  /** File page trailer @{ */
  #define FIL_PAGE_END_LSN_OLD_CHKSUM 8	/*!< the low 4 bytes of this are used
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-04 15:52:23.474482590 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-04 15:53:45.048512100 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -224,6 +224,7 @@
  
  extern ibool	srv_use_doublewrite_buf;
@@ -226,9 +219,8 @@
  
  extern ulong	srv_max_buf_pool_modified_pct;
  extern ulong	srv_max_purge_lag;
-diff -ruN a/storage/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h
---- a/storage/innobase/include/ut0rnd.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/ut0rnd.h	2010-12-04 15:53:45.049510146 +0900
+--- a/storage/innobase/include/ut0rnd.h
++++ b/storage/innobase/include/ut0rnd.h
 @@ -124,6 +124,13 @@
  	const byte*	str,	/*!< in: string of bytes */
  	ulint		len)	/*!< in: length */
@@ -243,9 +235,8 @@
  /***********************************************************//**
  Looks for a prime number slightly greater than the given argument.
  The prime is chosen so that it is not near any power of 2.
-diff -ruN a/storage/innobase/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic
---- a/storage/innobase/include/ut0rnd.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/ut0rnd.ic	2010-12-04 15:53:45.050565975 +0900
+--- a/storage/innobase/include/ut0rnd.ic
++++ b/storage/innobase/include/ut0rnd.ic
 @@ -226,3 +226,28 @@
  
  	return(fold);
@@ -275,9 +266,8 @@
 +
 +	return(fold);
 +}
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-04 15:52:23.498513634 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-04 15:53:45.053550283 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -414,6 +414,7 @@
  
  UNIV_INTERN ibool	srv_use_doublewrite_buf	= TRUE;
 
=== modified file 'patches/innodb_files_extend.patch'
--- patches/innodb_files_extend.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_files_extend.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-12-04 15:55:21.358513751 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-04 15:55:58.243481131 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -731,7 +731,7 @@
  		ut_a(space->purpose != FIL_LOG);
  		ut_a(!trx_sys_sys_space(space->id));
@@ -48,9 +47,8 @@
  	ut_ad(fil_validate_skip());
  #ifndef UNIV_HOTBACKUP
  # ifndef UNIV_LOG_DEBUG
-diff -ruN a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c
---- a/storage/innobase/fsp/fsp0fsp.c	2010-12-04 15:52:23.411513754 +0900
-+++ b/storage/innobase/fsp/fsp0fsp.c	2010-12-04 15:55:58.244514273 +0900
+--- a/storage/innobase/fsp/fsp0fsp.c
++++ b/storage/innobase/fsp/fsp0fsp.c
 @@ -656,16 +656,18 @@
  				0 for uncompressed pages */
  	ulint	offset)		/*!< in: page offset */
@@ -99,9 +97,8 @@
  
  		if (UNIV_UNLIKELY(init_xdes)) {
  
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:55:21.367482924 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:55:58.248549631 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -148,6 +148,9 @@
  static ulong innobase_write_io_threads;
  static long innobase_buffer_pool_instances = 1;
@@ -217,9 +214,8 @@
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2010-12-04 15:55:21.375482937 +0900
-+++ b/storage/innobase/include/buf0buf.h	2010-12-04 15:55:58.258469088 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -1683,7 +1683,7 @@
  	time_t		last_printout_time;
  					/*!< when buf_print_io was last time
@@ -251,9 +247,8 @@
  #if BUF_BUDDY_LOW > PAGE_ZIP_MIN_SIZE
  # error "BUF_BUDDY_LOW > PAGE_ZIP_MIN_SIZE"
  #endif
-diff -ruN a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
---- a/storage/innobase/include/buf0types.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/buf0types.h	2010-12-04 15:55:58.259482590 +0900
+--- a/storage/innobase/include/buf0types.h
++++ b/storage/innobase/include/buf0types.h
 @@ -72,12 +72,13 @@
  					buddy system; must be at least
  					sizeof(buf_page_t) */
@@ -269,9 +264,8 @@
  /* @} */
  
  #endif
-diff -ruN a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h
---- a/storage/innobase/include/fsp0types.h	2010-12-04 02:58:26.000000000 +0900
-+++ b/storage/innobase/include/fsp0types.h	2011-02-03 15:14:21.000000000 +0900
+--- a/storage/innobase/include/fsp0types.h
++++ b/storage/innobase/include/fsp0types.h
 @@ -42,7 +42,7 @@
  /* @} */
  
@@ -281,9 +275,8 @@
  
  /** On a page of any file segment, data may be put starting from this
  offset */
-diff -ruN a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h
---- a/storage/innobase/include/log0log.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/log0log.h	2010-12-09 18:16:47.737728305 +0900
+--- a/storage/innobase/include/log0log.h
++++ b/storage/innobase/include/log0log.h
 @@ -672,6 +672,9 @@
  					when mysqld is first time started
  					on the restored database, it can
@@ -294,9 +287,8 @@
  #define	LOG_FILE_ARCH_COMPLETED	OS_FILE_LOG_BLOCK_SIZE
  					/* this 4-byte field is TRUE when
  					the writing of an archived log file
-diff -ruN a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
---- a/storage/innobase/include/mtr0log.ic	2010-12-04 15:37:50.590551517 +0900
-+++ b/storage/innobase/include/mtr0log.ic	2010-12-04 15:55:58.260482404 +0900
+--- a/storage/innobase/include/mtr0log.ic
++++ b/storage/innobase/include/mtr0log.ic
 @@ -203,7 +203,7 @@
  	system tablespace */
  	if ((space == TRX_SYS_SPACE
@@ -306,9 +298,8 @@
  		if (trx_doublewrite_buf_is_being_created) {
  			/* Do nothing: we only come to this branch in an
  			InnoDB database creation. We do not redo log
-diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
---- a/storage/innobase/include/os0file.h	2010-12-09 18:16:02.323727427 +0900
-+++ b/storage/innobase/include/os0file.h	2010-12-09 18:16:47.738694194 +0900
+--- a/storage/innobase/include/os0file.h
++++ b/storage/innobase/include/os0file.h
 @@ -101,7 +101,7 @@
  if this fails for a log block, then it is equivalent to a media failure in the
  log. */
@@ -327,9 +318,8 @@
  #ifdef UNIV_PFS_IO
  /* Keys to register InnoDB I/O with performance schema */
  extern mysql_pfs_key_t	innodb_file_data_key;
-diff -ruN a/storage/innobase/include/page0types.h b/storage/innobase/include/page0types.h
---- a/storage/innobase/include/page0types.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/page0types.h	2010-12-04 15:55:58.261483930 +0900
+--- a/storage/innobase/include/page0types.h
++++ b/storage/innobase/include/page0types.h
 @@ -56,8 +56,9 @@
  
  /** Number of supported compressed page sizes */
@@ -351,9 +341,8 @@
  
  /**********************************************************************//**
  Write the "deleted" flag of a record on a compressed page.  The flag must
-diff -ruN a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
---- a/storage/innobase/include/trx0sys.h	2010-12-04 15:37:50.593480594 +0900
-+++ b/storage/innobase/include/trx0sys.h	2010-12-04 15:55:58.262549554 +0900
+--- a/storage/innobase/include/trx0sys.h
++++ b/storage/innobase/include/trx0sys.h
 @@ -515,9 +515,9 @@
  /** Contents of TRX_SYS_MYSQL_LOG_MAGIC_N_FLD */
  #define TRX_SYS_MYSQL_LOG_MAGIC_N	873422344
@@ -367,9 +356,8 @@
  /** The offset of the MySQL replication info in the trx system header;
  this contains the same fields as TRX_SYS_MYSQL_LOG_INFO below */
  #define TRX_SYS_MYSQL_MASTER_LOG_INFO	(UNIV_PAGE_SIZE - 2000)
-diff -ruN a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
---- a/storage/innobase/include/univ.i	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/univ.i	2010-12-04 15:55:58.263549721 +0900
+--- a/storage/innobase/include/univ.i
++++ b/storage/innobase/include/univ.i
 @@ -311,9 +311,13 @@
  */
  
@@ -402,9 +390,8 @@
 +extern ulint	srv_page_size_shift;
 +extern ulint	srv_page_size;
  #endif
-diff -ruN a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c
---- a/storage/innobase/log/log0log.c	2010-12-03 15:18:48.899986203 +0900
-+++ b/storage/innobase/log/log0log.c	2010-12-04 15:55:58.266551567 +0900
+--- a/storage/innobase/log/log0log.c
++++ b/storage/innobase/log/log0log.c
 @@ -604,7 +604,9 @@
  
  	offset = (gr_lsn_size_offset + difference) % group_size;
@@ -455,9 +442,8 @@
  #endif /* UNIV_LOG_ARCHIVE */
  
  	for (i = 0; i < LOG_MAX_N_GROUPS; i++) {
-diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
---- a/storage/innobase/log/log0recv.c	2010-12-03 17:32:15.638986405 +0900
-+++ b/storage/innobase/log/log0recv.c	2010-12-04 15:55:58.269550689 +0900
+--- a/storage/innobase/log/log0recv.c
++++ b/storage/innobase/log/log0recv.c
 @@ -712,8 +712,22 @@
  
  			group->lsn = mach_read_from_8(
@@ -511,9 +497,8 @@
  #ifdef UNIV_LOG_ARCHIVE
  	group = UT_LIST_GET_FIRST(log_sys->log_groups);
  
-diff -ruN a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c
---- a/storage/innobase/page/page0zip.c	2010-12-04 15:52:23.484482786 +0900
-+++ b/storage/innobase/page/page0zip.c	2010-12-04 15:55:58.274551431 +0900
+--- a/storage/innobase/page/page0zip.c
++++ b/storage/innobase/page/page0zip.c
 @@ -49,7 +49,7 @@
  
  #ifndef UNIV_HOTBACKUP
@@ -523,9 +508,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  /* Please refer to ../include/page0zip.ic for a description of the
-diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c
---- a/storage/innobase/row/row0merge.c	2010-12-04 15:52:23.490513562 +0900
-+++ b/storage/innobase/row/row0merge.c	2010-12-04 15:55:58.277550562 +0900
+--- a/storage/innobase/row/row0merge.c
++++ b/storage/innobase/row/row0merge.c
 @@ -97,7 +97,7 @@
  row_merge_block_t.  Thus, it must be able to hold one merge record,
  whose maximum size is the same as the minimum size of
@@ -535,9 +519,8 @@
  
  /** @brief Merge record in row_merge_block_t.
  
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-04 15:55:21.384486344 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-04 15:55:58.282550845 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -234,6 +234,13 @@
  UNIV_INTERN ulint	srv_n_read_io_threads	= ULINT_MAX;
  UNIV_INTERN ulint	srv_n_write_io_threads	= ULINT_MAX;
@@ -552,9 +535,8 @@
  /* User settable value of the number of pages that must be present
  in the buffer cache and accessed sequentially for InnoDB to trigger a
  readahead request. */
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
---- a/storage/innobase/srv/srv0start.c	2010-12-04 15:52:23.502513556 +0900
-+++ b/storage/innobase/srv/srv0start.c	2010-12-04 15:55:58.285550583 +0900
+--- a/storage/innobase/srv/srv0start.c
++++ b/storage/innobase/srv/srv0start.c
 @@ -1561,11 +1561,13 @@
  	}
  #endif /* UNIV_LOG_ARCHIVE */
 
=== modified file 'patches/innodb_fix_misc.patch'
--- patches/innodb_fix_misc.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_fix_misc.patch	2011-07-27 11:32:35 +0000
@@ -10,9 +10,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2011-02-23 19:00:48.178696354 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2011-02-23 19:01:19.138826278 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -4084,6 +4084,7 @@
  		bpage->state	= BUF_BLOCK_ZIP_PAGE;
  		bpage->space	= space;
@@ -21,9 +20,8 @@
  
  
  #ifdef UNIV_DEBUG
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
---- a/storage/innobase/buf/buf0flu.c	2011-02-23 19:00:48.182659256 +0900
-+++ b/storage/innobase/buf/buf0flu.c	2011-02-23 19:01:19.138826278 +0900
+--- a/storage/innobase/buf/buf0flu.c
++++ b/storage/innobase/buf/buf0flu.c
 @@ -439,7 +439,7 @@
  
  	if (UNIV_LIKELY(bpage->in_LRU_list && buf_page_in_file(bpage))) {
@@ -47,9 +45,8 @@
  		if (flush_type != BUF_FLUSH_LRU) {
  
  			return(TRUE);
-diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
---- a/storage/innobase/buf/buf0lru.c	2011-02-23 19:00:47.939695791 +0900
-+++ b/storage/innobase/buf/buf0lru.c	2011-02-23 19:01:19.142741970 +0900
+--- a/storage/innobase/buf/buf0lru.c
++++ b/storage/innobase/buf/buf0lru.c
 @@ -574,6 +574,37 @@
  	}
  }
@@ -99,9 +96,8 @@
  #ifdef UNIV_IBUF_COUNT_DEBUG
  	ut_a(ibuf_count_get(bpage->space, bpage->offset) == 0);
  #endif /* UNIV_IBUF_COUNT_DEBUG */
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2011-02-23 19:00:48.223696428 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2011-02-23 19:01:19.147655510 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -254,6 +254,7 @@
  struct fil_system_struct {
  #ifndef UNIV_HOTBACKUP
@@ -300,9 +296,8 @@
  	}
  
  	ut_a(ret);
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:57:13.035513990 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:57:53.084513775 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -12007,6 +12007,12 @@
    "except for the deletion.",
    NULL, NULL, 0, &corrupt_table_action_typelib);
@@ -333,9 +328,8 @@
    PLUGIN_LICENSE_GPL,
    innobase_init, /* Plugin Init */
    NULL, /* Plugin Deinit */
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2011-02-23 19:00:48.252696774 +0900
-+++ b/storage/innobase/include/buf0buf.h	2011-02-23 19:01:19.182655902 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -1438,6 +1438,7 @@
  					0 if the block was never accessed
  					in the buffer pool */
@@ -344,9 +338,8 @@
  	ibool		is_corrupt;
  # if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
  	ibool		file_page_was_freed;
-diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
---- a/storage/innobase/include/buf0buf.ic	2011-02-23 19:00:48.130659154 +0900
-+++ b/storage/innobase/include/buf0buf.ic	2011-02-23 19:01:19.185655906 +0900
+--- a/storage/innobase/include/buf0buf.ic
++++ b/storage/innobase/include/buf0buf.ic
 @@ -408,6 +408,7 @@
  	buf_block_set_state(block, BUF_BLOCK_FILE_PAGE);
  	block->page.space = space;
@@ -355,9 +348,8 @@
  }
  
  /*********************************************************************//**
-diff -ruN a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
---- a/storage/innobase/include/buf0lru.h	2011-02-23 19:00:47.977658923 +0900
-+++ b/storage/innobase/include/buf0lru.h	2011-02-23 19:01:19.188625768 +0900
+--- a/storage/innobase/include/buf0lru.h
++++ b/storage/innobase/include/buf0lru.h
 @@ -85,6 +85,13 @@
  buf_LRU_invalidate_tablespace(
  /*==========================*/
@@ -372,9 +364,8 @@
  /********************************************************************//**
  Insert a compressed block into buf_pool->zip_clean in the LRU order. */
  UNIV_INTERN
-diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
---- a/storage/innobase/include/os0file.h	2011-02-23 19:00:48.260696646 +0900
-+++ b/storage/innobase/include/os0file.h	2011-02-23 19:01:19.190656054 +0900
+--- a/storage/innobase/include/os0file.h
++++ b/storage/innobase/include/os0file.h
 @@ -280,9 +280,9 @@
  	pfs_os_file_close_func(file, __FILE__, __LINE__)
  
@@ -445,9 +436,8 @@
  #endif /* LINUX_NATIVE_AIO */
  
  #ifndef UNIV_NONINL
-diff -ruN a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic
---- a/storage/innobase/include/os0file.ic	2011-02-23 19:00:47.915696756 +0900
-+++ b/storage/innobase/include/os0file.ic	2011-02-23 19:01:19.191625891 +0900
+--- a/storage/innobase/include/os0file.ic
++++ b/storage/innobase/include/os0file.ic
 @@ -229,6 +229,7 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
@@ -465,9 +455,8 @@
  
  	register_pfs_file_io_end(locker, n);
  
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2011-02-23 19:00:48.212625715 +0900
-+++ b/storage/innobase/include/srv0srv.h	2011-02-23 19:01:19.193655990 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -244,6 +244,8 @@
  extern ulint	srv_pass_corrupt_table;
  
@@ -477,9 +466,8 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
---- a/storage/innobase/include/sync0sync.h	2011-02-23 19:00:47.875625940 +0900
-+++ b/storage/innobase/include/sync0sync.h	2011-02-23 19:01:19.195703856 +0900
+--- a/storage/innobase/include/sync0sync.h
++++ b/storage/innobase/include/sync0sync.h
 @@ -691,6 +691,7 @@
  #define	SYNC_BUF_POOL		150	/* Buffer pool mutex */
  #define	SYNC_BUF_FLUSH_LIST	145	/* Buffer flush list mutex */
@@ -488,9 +476,8 @@
  #define	SYNC_ANY_LATCH		135
  #define SYNC_THR_LOCAL		133
  #define	SYNC_MEM_HASH		131
-diff -ruN a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
---- a/storage/innobase/include/univ.i	2010-12-04 15:57:13.050485224 +0900
-+++ b/storage/innobase/include/univ.i	2010-12-04 15:57:53.091592933 +0900
+--- a/storage/innobase/include/univ.i
++++ b/storage/innobase/include/univ.i
 @@ -53,6 +53,11 @@
  #define INNODB_VERSION_MINOR	1
  #define INNODB_VERSION_BUGFIX	7
@@ -513,9 +500,8 @@
  
  #define REFMAN "http://dev.mysql.com/doc/refman/"	\
  	IB_TO_STR(MYSQL_MAJOR_VERSION) "."		\
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
---- a/storage/innobase/os/os0file.c	2011-02-23 19:00:47.928696481 +0900
-+++ b/storage/innobase/os/os0file.c	2011-02-23 19:01:19.200696353 +0900
+--- a/storage/innobase/os/os0file.c
++++ b/storage/innobase/os/os0file.c
 @@ -180,6 +180,7 @@
  					made and only the slot message
  					needs to be passed to the caller
@@ -524,7 +510,7 @@
  	fil_node_t*	message1;	/*!< message which is given by the */
  	void*		message2;	/*!< the requester of an aio operation
  					and which can be used to identify
-@@ -3685,7 +3686,8 @@
+@@ -3686,7 +3687,8 @@
  				offset */
  	ulint		offset_high, /*!< in: most significant 32 bits of
  				offset */
@@ -534,7 +520,7 @@
  {
  	os_aio_slot_t*	slot = NULL;
  #ifdef WIN_ASYNC_IO
-@@ -3774,6 +3776,7 @@
+@@ -3775,6 +3777,7 @@
  	slot->offset   = offset;
  	slot->offset_high = offset_high;
  	slot->io_already_done = FALSE;
@@ -542,7 +528,7 @@
  
  #ifdef WIN_ASYNC_IO
  	control = &(slot->control);
-@@ -4061,6 +4064,7 @@
+@@ -4062,6 +4065,7 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
  				OS_AIO_SYNC */
@@ -550,7 +536,7 @@
  	trx_t*		trx)
  {
  	os_aio_array_t*	array;
-@@ -4149,7 +4153,7 @@
+@@ -4150,7 +4154,7 @@
  		trx->io_read += n;
  	}
  	slot = os_aio_array_reserve_slot(type, array, message1, message2, file,
@@ -559,7 +545,7 @@
  	if (type == OS_FILE_READ) {
  		if (srv_use_native_aio) {
  			os_n_file_reads++;
-@@ -4268,7 +4272,8 @@
+@@ -4269,7 +4273,8 @@
  				parameters are valid and can be used to
  				restart the operation, for example */
  	void**	message2,
@@ -569,7 +555,7 @@
  {
  	ulint		orig_seg	= segment;
  	os_aio_array_t*	array;
-@@ -4347,6 +4352,7 @@
+@@ -4348,6 +4353,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -577,7 +563,7 @@
  
  	if (ret && len == slot->len) {
  		ret_val = TRUE;
-@@ -4575,7 +4581,8 @@
+@@ -4576,7 +4582,8 @@
  				aio operation failed, these output
  				parameters are valid and can be used to
  				restart the operation. */
@@ -587,7 +573,7 @@
  {
  	ulint		segment;
  	os_aio_array_t*	array;
-@@ -4648,6 +4655,7 @@
+@@ -4649,6 +4656,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -595,7 +581,7 @@
  
  	if ((slot->ret == 0) && (slot->n_bytes == (long)slot->len)) {
  		ret = TRUE;
-@@ -4701,7 +4709,8 @@
+@@ -4702,7 +4710,8 @@
  				parameters are valid and can be used to
  				restart the operation, for example */
  	void**	message2,
@@ -605,7 +591,7 @@
  {
  	os_aio_array_t*	array;
  	ulint		segment;
-@@ -4997,6 +5006,7 @@
+@@ -4998,6 +5007,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -613,9 +599,8 @@
  
  	os_mutex_exit(array->mutex);
  
-diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
---- a/storage/innobase/row/row0mysql.c	2010-12-04 15:37:50.598481116 +0900
-+++ b/storage/innobase/row/row0mysql.c	2010-12-04 15:57:53.092563335 +0900
+--- a/storage/innobase/row/row0mysql.c
++++ b/storage/innobase/row/row0mysql.c
 @@ -51,6 +51,7 @@
  #include "btr0sea.h"
  #include "fil0fil.h"
@@ -638,9 +623,8 @@
  	if (prebuilt->sql_stat_start) {
  		node->state = INS_NODE_SET_IX_LOCK;
  		prebuilt->sql_stat_start = FALSE;
-diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
---- a/storage/innobase/row/row0sel.c	2010-12-04 15:52:23.494514495 +0900
-+++ b/storage/innobase/row/row0sel.c	2010-12-04 16:01:38.320883699 +0900
+--- a/storage/innobase/row/row0sel.c
++++ b/storage/innobase/row/row0sel.c
 @@ -3366,6 +3366,7 @@
  	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
  	ulint*		offsets				= offsets_;
@@ -686,9 +670,8 @@
  			trx_print(stderr, trx, 600);
  			fputc('\n', stderr);
  			ut_error;
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2011-02-23 19:00:48.283695497 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2011-02-23 19:01:19.204696643 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -441,6 +441,8 @@
  UNIV_INTERN ulint	srv_pass_corrupt_table = 0; /* 0:disable 1:enable */
  
@@ -698,9 +681,8 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
---- a/storage/innobase/srv/srv0start.c	2010-12-04 15:57:13.073495392 +0900
-+++ b/storage/innobase/srv/srv0start.c	2010-12-04 16:02:50.704884053 +0900
+--- a/storage/innobase/srv/srv0start.c
++++ b/storage/innobase/srv/srv0start.c
 @@ -2161,7 +2161,7 @@
  	if (srv_print_verbose_log) {
  		ut_print_timestamp(stderr);
@@ -710,9 +692,8 @@
  			"log sequence number %llu\n",
  			INNODB_VERSION_STR, srv_start_lsn);
  	}
-diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
---- a/storage/innobase/sync/sync0sync.c	2011-02-25 14:18:55.817202060 +0900
-+++ b/storage/innobase/sync/sync0sync.c	2011-02-25 14:19:44.596202017 +0900
+--- a/storage/innobase/sync/sync0sync.c
++++ b/storage/innobase/sync/sync0sync.c
 @@ -1220,6 +1220,7 @@
  	case SYNC_LOG_FLUSH_ORDER:
  	case SYNC_THR_LOCAL:
@@ -721,9 +702,8 @@
  	case SYNC_FILE_FORMAT_TAG:
  	case SYNC_DOUBLEWRITE:
  	case SYNC_SEARCH_SYS:
-diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
---- a/storage/innobase/trx/trx0purge.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/trx/trx0purge.c	2010-12-04 15:57:53.106551154 +0900
+--- a/storage/innobase/trx/trx0purge.c
++++ b/storage/innobase/trx/trx0purge.c
 @@ -1149,8 +1149,7 @@
  	/* If we cannot advance the 'purge view' because of an old
  	'consistent read view', then the DML statements cannot be delayed.
 
=== modified file 'patches/innodb_io_patches.patch'
--- patches/innodb_io_patches.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_io_patches.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2011-07-07 18:43:12.000000000 +0400
-+++ b/storage/innobase/buf/buf0buf.c	2011-07-07 19:01:24.000000000 +0400
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -320,6 +320,7 @@
  
  	/* When we traverse all the flush lists we don't want another
@@ -24,9 +23,8 @@
  	log_flush_order_mutex_exit();
  
  	/* The returned answer may be out of date: the flush_list can
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
---- a/storage/innobase/buf/buf0flu.c	2011-07-07 18:43:12.000000000 +0400
-+++ b/storage/innobase/buf/buf0flu.c	2011-07-07 19:01:24.000000000 +0400
+--- a/storage/innobase/buf/buf0flu.c
++++ b/storage/innobase/buf/buf0flu.c
 @@ -855,7 +855,7 @@
  flush:
  	/* Now flush the doublewrite buffer data to disk */
@@ -45,9 +43,8 @@
  		/* If there is little space, it is better not to flush
  		any block except from the end of the LRU list */
  
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/buf/buf0rea.c	2011-07-07 19:01:24.000000000 +0400
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -260,6 +260,10 @@
  		= BUF_READ_AHEAD_LINEAR_AREA(buf_pool);
  	ulint		threshold;
@@ -59,9 +56,8 @@
  	if (UNIV_UNLIKELY(srv_startup_is_before_trx_rollback_phase)) {
  		/* No read-ahead to avoid thread deadlocks */
  		return(0);
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2011-07-07 18:43:12.000000000 +0400
-+++ b/storage/innobase/fil/fil0fil.c	2011-07-07 19:01:22.000000000 +0400
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -2600,7 +2600,7 @@
  
  		os_thread_sleep(20000);
@@ -136,9 +132,8 @@
  	}
  
  	mem_free(space_ids);
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2011-07-07 18:43:12.000000000 +0400
-+++ b/storage/innobase/handler/ha_innodb.cc	2011-07-07 19:01:24.000000000 +0400
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -444,6 +444,12 @@
    "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
    NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0);
@@ -341,9 +336,8 @@
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(use_native_aio),
    MYSQL_SYSVAR(change_buffering),
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
---- a/storage/innobase/ibuf/ibuf0ibuf.c	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/ibuf/ibuf0ibuf.c	2011-07-07 19:01:23.000000000 +0400
+--- a/storage/innobase/ibuf/ibuf0ibuf.c
++++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -514,8 +514,10 @@
  	grow in size, as the references on the upper levels of the tree can
  	change */
@@ -369,9 +363,8 @@
  
  	sync = (size >= max_size + IBUF_CONTRACT_ON_INSERT_SYNC);
  
-diff -ruN a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h
---- a/storage/innobase/include/buf0rea.h	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/include/buf0rea.h	2011-07-07 19:01:21.000000000 +0400
+--- a/storage/innobase/include/buf0rea.h
++++ b/storage/innobase/include/buf0rea.h
 @@ -124,8 +124,7 @@
  
  /** The size in pages of the area which the read-ahead algorithms read if
@@ -382,9 +375,8 @@
  
  /** @name Modes used in read-ahead @{ */
  /** read only pages belonging to the insert buffer tree */
-diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
---- a/storage/innobase/include/fil0fil.h	2011-07-07 18:43:12.000000000 +0400
-+++ b/storage/innobase/include/fil0fil.h	2011-07-07 19:01:21.000000000 +0400
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
 @@ -658,8 +658,9 @@
  void
  fil_flush(
@@ -396,9 +388,8 @@
  /**********************************************************************//**
  Flushes to disk writes in file spaces of the given type possibly cached by
  the OS. */
-diff -ruN a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
---- a/storage/innobase/include/ha_prototypes.h	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/include/ha_prototypes.h	2011-07-07 18:43:13.000000000 +0400
+--- a/storage/innobase/include/ha_prototypes.h
++++ b/storage/innobase/include/ha_prototypes.h
 @@ -284,6 +284,13 @@
  /*===================*/
          void*   thd,	/*!< in: thread handle (THD*) */
@@ -413,9 +404,8 @@
  
  /**********************************************************************//**
  Get the current setting of the lower_case_table_names global parameter from
-diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
---- a/storage/innobase/include/os0file.h	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/include/os0file.h	2011-07-07 19:01:21.000000000 +0400
+--- a/storage/innobase/include/os0file.h
++++ b/storage/innobase/include/os0file.h
 @@ -296,8 +296,8 @@
  	pfs_os_file_write_func(name, file, buf, offset, offset_high,	\
  			       n, __FILE__, __LINE__)
@@ -454,9 +444,8 @@
  /***********************************************************************//**
  Retrieves the last error number if an error occurs in a file io function.
  The number should be retrieved before any other OS calls (because they may
-diff -ruN a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic
---- a/storage/innobase/include/os0file.ic	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/include/os0file.ic	2011-07-07 19:01:21.000000000 +0400
+--- a/storage/innobase/include/os0file.ic
++++ b/storage/innobase/include/os0file.ic
 @@ -369,6 +369,7 @@
  pfs_os_file_flush_func(
  /*===================*/
@@ -474,9 +463,8 @@
  
  	register_pfs_file_io_end(locker, 0);
  
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2011-07-07 18:43:12.000000000 +0400
-+++ b/storage/innobase/include/srv0srv.h	2011-07-07 19:01:23.000000000 +0400
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -138,7 +138,8 @@
  extern ulint	srv_n_log_files;
  extern ulint	srv_log_file_size;
@@ -515,9 +503,8 @@
  };
  
  /** Alternatives for file i/o in Windows */
-diff -ruN a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c
---- a/storage/innobase/log/log0log.c	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/log/log0log.c	2011-07-07 19:01:19.000000000 +0400
+--- a/storage/innobase/log/log0log.c
++++ b/storage/innobase/log/log0log.c
 @@ -48,6 +48,7 @@
  #include "srv0start.h"
  #include "trx0sys.h"
@@ -674,9 +661,8 @@
  	current_time = time(NULL);
  
  	time_elapsed = 0.001 + difftime(current_time,
-diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
---- a/storage/innobase/log/log0recv.c	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/log/log0recv.c	2011-07-07 19:01:22.000000000 +0400
+--- a/storage/innobase/log/log0recv.c
++++ b/storage/innobase/log/log0recv.c
 @@ -2906,9 +2906,12 @@
  	ib_uint64_t	archived_lsn;
  #endif /* UNIV_LOG_ARCHIVE */
@@ -709,9 +695,8 @@
  	os_file_close(log_file);
  
  	ut_free(buf);
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
---- a/storage/innobase/os/os0file.c	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/os/os0file.c	2011-07-07 19:01:37.000000000 +0400
+--- a/storage/innobase/os/os0file.c
++++ b/storage/innobase/os/os0file.c
 @@ -1424,7 +1424,7 @@
  #endif
  #ifdef UNIV_NON_BUFFERED_IO
@@ -855,9 +840,8 @@
  			ut_error;
  		}
  #endif /* UNIV_DO_FLUSH */
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2011-07-07 18:43:13.000000000 +0400
-+++ b/storage/innobase/srv/srv0srv.c	2011-07-07 19:01:23.000000000 +0400
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -183,7 +183,8 @@
  UNIV_INTERN ulint	srv_log_file_size	= ULINT_MAX;
  /* size in database pages */
@@ -1277,9 +1261,8 @@
  	}
  
  	mutex_enter(&kernel_mutex);
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
---- a/storage/innobase/srv/srv0start.c	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/srv/srv0start.c	2011-07-07 19:01:21.000000000 +0400
+--- a/storage/innobase/srv/srv0start.c
++++ b/storage/innobase/srv/srv0start.c
 @@ -1217,6 +1217,9 @@
  	} else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DIRECT")) {
  		srv_unix_file_flush_method = SRV_UNIX_O_DIRECT;
@@ -1290,9 +1273,8 @@
  	} else if (0 == ut_strcmp(srv_file_flush_method_str, "littlesync")) {
  		srv_unix_file_flush_method = SRV_UNIX_LITTLESYNC;
  
-diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
---- a/storage/innobase/trx/trx0purge.c	2011-07-07 18:43:13.000000000 +0400
-+++ b/storage/innobase/trx/trx0purge.c	2011-07-07 19:01:19.000000000 +0400
+--- a/storage/innobase/trx/trx0purge.c
++++ b/storage/innobase/trx/trx0purge.c
 @@ -392,10 +392,10 @@
  	trx_sys->rseg_history_len++;
  	mutex_exit(&kernel_mutex);
@@ -1306,9 +1288,8 @@
  }
  
  /**********************************************************************//**
-diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
---- a/storage/innobase/trx/trx0trx.c	2011-05-11 15:54:12.000000000 +0400
-+++ b/storage/innobase/trx/trx0trx.c	2011-07-07 19:01:24.000000000 +0400
+--- a/storage/innobase/trx/trx0trx.c
++++ b/storage/innobase/trx/trx0trx.c
 @@ -984,6 +984,7 @@
  	trx->read_view = NULL;
  
 
=== modified file 'patches/innodb_lru_dump_restore.patch'
--- patches/innodb_lru_dump_restore.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_lru_dump_restore.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
---- a/storage/innobase/buf/buf0lru.c	2010-12-03 15:49:59.185023424 +0900
-+++ b/storage/innobase/buf/buf0lru.c	2010-12-04 15:33:37.626482350 +0900
+--- a/storage/innobase/buf/buf0lru.c
++++ b/storage/innobase/buf/buf0lru.c
 @@ -2247,6 +2247,284 @@
  	memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
  }
@@ -293,9 +292,8 @@
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  /**********************************************************************//**
  Validates the LRU list for one buffer pool instance. */
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2010-12-03 17:49:11.576124814 +0900
-+++ b/storage/innobase/buf/buf0rea.c	2010-12-04 15:33:37.628480605 +0900
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -58,7 +58,7 @@
  which case it is never read into the pool, or if the tablespace does
  not exist or is being dropped 
@@ -305,9 +303,8 @@
  ulint
  buf_read_page_low(
  /*==============*/
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-12-03 17:49:11.581025127 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-04 15:33:37.632482885 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -5289,6 +5289,70 @@
  	return(DB_SUCCESS);
  }
@@ -379,9 +376,8 @@
  #ifndef UNIV_HOTBACKUP
  /**********************************************************************//**
  Waits for an aio operation to complete. This function is used to write the
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:49:11.589956135 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:33:37.645555490 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -11793,6 +11793,12 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
@@ -403,9 +399,8 @@
    MYSQL_SYSVAR(purge_threads),
    MYSQL_SYSVAR(purge_batch_size),
    MYSQL_SYSVAR(rollback_segments),
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc	2010-12-03 17:34:35.286211349 +0900
-+++ b/storage/innobase/handler/i_s.cc	2010-12-04 15:33:37.677480733 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -50,6 +50,7 @@
  #include "trx0rseg.h" /* for trx_rseg_struct */
  #include "trx0sys.h" /* for trx_sys */
@@ -451,9 +446,8 @@
  
  	field_store_string(i_s_table->field[0],
  		"Undefined XTRA_* command.");
-diff -ruN a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
---- a/storage/innobase/include/buf0lru.h	2010-12-03 15:49:59.223956070 +0900
-+++ b/storage/innobase/include/buf0lru.h	2010-12-04 15:33:37.681481467 +0900
+--- a/storage/innobase/include/buf0lru.h
++++ b/storage/innobase/include/buf0lru.h
 @@ -215,6 +215,18 @@
  void
  buf_LRU_stat_update(void);
@@ -473,9 +467,8 @@
  
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  /**********************************************************************//**
-diff -ruN a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h
---- a/storage/innobase/include/buf0rea.h	2010-12-03 17:49:11.596953870 +0900
-+++ b/storage/innobase/include/buf0rea.h	2010-12-04 15:33:37.682563900 +0900
+--- a/storage/innobase/include/buf0rea.h
++++ b/storage/innobase/include/buf0rea.h
 @@ -31,6 +31,37 @@
  #include "buf0types.h"
  
@@ -514,9 +507,8 @@
  High-level function which reads a page asynchronously from a file to the
  buffer buf_pool if it is not already there. Sets the io_fix flag and sets
  an exclusive lock on the buffer frame. The flag is cleared and the x-lock
-diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
---- a/storage/innobase/include/fil0fil.h	2010-12-03 17:49:11.597953501 +0900
-+++ b/storage/innobase/include/fil0fil.h	2010-12-04 15:33:37.684551372 +0900
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
 @@ -644,6 +644,14 @@
  	void*	message,	/*!< in: message for aio handler if non-sync
  				aio used, else ignored */
@@ -532,9 +524,8 @@
  /**********************************************************************//**
  Waits for an aio operation to complete. This function is used to write the
  handler for completed requests. The aio array of pending requests is divided
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-03 17:49:11.603969747 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-04 15:33:37.685550816 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -356,6 +356,9 @@
  reading of a disk page */
  extern ulint srv_buf_pool_reads;
@@ -562,9 +553,8 @@
  /******************************************************************//**
  Outputs to a file the output of the InnoDB Monitor.
  @return FALSE if not all information printed
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 17:49:11.620986661 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-04 15:33:37.708550811 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -330,6 +330,9 @@
  reading of a disk page */
  UNIV_INTERN ulint srv_buf_pool_reads = 0;
@@ -575,15 +565,10 @@
  /* structure to pass status variables to MySQL */
  UNIV_INTERN export_struc export_vars;
  
-@@ -2701,6 +2704,56 @@
- 	/* We count the number of threads in os_thread_exit(). A created
- 	thread should always use that to exit and not use return() to exit. */
+@@ -2706,6 +2709,56 @@
+ 	OS_THREAD_DUMMY_RETURN;
+ }
  
-+	os_thread_exit(NULL);
-+
-+	OS_THREAD_DUMMY_RETURN;
-+}
-+
 +/*********************************************************************//**
 +A thread which restores the buffer pool from a dump file on startup and does
 +periodic buffer pool dumps.
@@ -629,12 +614,16 @@
 +	/* We count the number of threads in os_thread_exit(). A created
 +	thread should always use that to exit and not use return() to exit. */
 +
- 	os_thread_exit(NULL);
- 
- 	OS_THREAD_DUMMY_RETURN;
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
---- a/storage/innobase/srv/srv0start.c	2010-12-03 15:18:48.916955609 +0900
-+++ b/storage/innobase/srv/srv0start.c	2010-12-04 15:33:37.711484798 +0900
++	os_thread_exit(NULL);
++
++	OS_THREAD_DUMMY_RETURN;
++}
++
+ /**********************************************************************//**
+ Check whether any background thread is active.
+ @return FALSE if all are are suspended or have exited. */
+--- a/storage/innobase/srv/srv0start.c
++++ b/storage/innobase/srv/srv0start.c
 @@ -120,9 +120,9 @@
  static os_file_t	files[1000];
  
 
=== modified file 'patches/innodb_opt_lru_count.patch'
--- patches/innodb_opt_lru_count.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_opt_lru_count.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c
---- a/storage/innobase/buf/buf0buddy.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/buf/buf0buddy.c	2010-12-03 15:20:49.593024343 +0900
+--- a/storage/innobase/buf/buf0buddy.c
++++ b/storage/innobase/buf/buf0buddy.c
 @@ -137,7 +137,7 @@
  			      ut_ad(buf_page_get_state(ut_list_node_313)
  				    == BUF_BLOCK_ZIP_FREE)));
@@ -17,9 +16,8 @@
  
  	if (bpage) {
  		UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i);
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-03 15:18:48.866986963 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-03 15:20:49.595987311 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -881,9 +881,9 @@
  	block->page.in_zip_hash = FALSE;
  	block->page.in_flush_list = FALSE;
@@ -59,9 +57,8 @@
  
  	frame = block->frame;
  
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
---- a/storage/innobase/buf/buf0flu.c	2010-12-03 15:18:48.868953442 +0900
-+++ b/storage/innobase/buf/buf0flu.c	2010-12-03 15:20:49.599986956 +0900
+--- a/storage/innobase/buf/buf0flu.c
++++ b/storage/innobase/buf/buf0flu.c
 @@ -431,19 +431,21 @@
  				buf_page_in_file(bpage) and in the LRU list */
  {
@@ -187,9 +184,8 @@
  	}
  }
  
-diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
---- a/storage/innobase/buf/buf0lru.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/buf/buf0lru.c	2010-12-03 15:20:49.602952786 +0900
+--- a/storage/innobase/buf/buf0lru.c
++++ b/storage/innobase/buf/buf0lru.c
 @@ -996,7 +996,7 @@
  
  	/* No free block was found: try to flush the LRU list */
@@ -235,9 +231,8 @@
  				buf_LRU_add_block_low(b, buf_page_is_old(b));
  			}
  
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2010-12-03 15:18:48.870953384 +0900
-+++ b/storage/innobase/buf/buf0rea.c	2010-12-03 15:20:49.604956032 +0900
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -200,7 +200,7 @@
  	}
  
@@ -274,9 +269,8 @@
  
  #ifdef UNIV_DEBUG
  	if (buf_debug_prints) {
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/buf0buf.h	2010-12-03 15:20:49.608986590 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -1387,11 +1387,11 @@
  
  	UT_LIST_NODE_T(buf_page_t) LRU;
@@ -291,9 +285,8 @@
  	unsigned	old:1;		/*!< TRUE if the block is in the old
  					blocks in buf_pool->LRU_old */
  	unsigned	freed_page_clock:31;/*!< the value of
-diff -ruN a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h
---- a/storage/innobase/include/buf0flu.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/buf0flu.h	2010-12-03 15:20:49.609953185 +0900
+--- a/storage/innobase/include/buf0flu.h
++++ b/storage/innobase/include/buf0flu.h
 @@ -65,13 +65,15 @@
  void
  buf_flush_free_margin(
 
=== modified file 'patches/innodb_overwrite_relay_log_info.patch'
--- patches/innodb_overwrite_relay_log_info.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_overwrite_relay_log_info.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:37:45.516105468 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:38:20.318952987 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -42,6 +42,8 @@
  #pragma implementation				// gcc: Class implementation
  #endif
@@ -270,9 +269,8 @@
    MYSQL_SYSVAR(rollback_on_timeout),
    MYSQL_SYSVAR(stats_on_metadata),
    MYSQL_SYSVAR(stats_sample_pages),
-diff -ruN a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
---- a/storage/innobase/include/trx0sys.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/trx0sys.h	2010-12-03 15:38:20.321953297 +0900
+--- a/storage/innobase/include/trx0sys.h
++++ b/storage/innobase/include/trx0sys.h
 @@ -53,6 +53,9 @@
  extern ib_int64_t	trx_sys_mysql_master_log_pos;
  /* @} */
@@ -309,9 +307,8 @@
  
  /** The offset of the MySQL binlog offset info in the trx system header */
  #define TRX_SYS_MYSQL_LOG_INFO		(UNIV_PAGE_SIZE - 1000)
-diff -ruN a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
---- a/storage/innobase/include/trx0trx.h	2010-12-03 15:18:48.894955550 +0900
-+++ b/storage/innobase/include/trx0trx.h	2010-12-03 15:38:20.323953416 +0900
+--- a/storage/innobase/include/trx0trx.h
++++ b/storage/innobase/include/trx0trx.h
 @@ -580,6 +580,20 @@
  	ib_int64_t	mysql_log_offset;/* if MySQL binlog is used, this field
  					contains the end offset of the binlog
@@ -333,9 +330,8 @@
  	/*------------------------------*/
  	ulint		n_mysql_tables_in_use; /* number of Innobase tables
  					used in the processing of the current
-diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
---- a/storage/innobase/trx/trx0sys.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/trx/trx0sys.c	2010-12-03 15:38:20.325956917 +0900
+--- a/storage/innobase/trx/trx0sys.c
++++ b/storage/innobase/trx/trx0sys.c
 @@ -76,13 +76,16 @@
  file name and position here. */
  /* @{ */
@@ -434,9 +430,8 @@
  	mtr_commit(&mtr);
  }
  
-diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
---- a/storage/innobase/trx/trx0trx.c	2010-12-03 15:37:45.549028990 +0900
-+++ b/storage/innobase/trx/trx0trx.c	2010-12-03 15:38:20.328957217 +0900
+--- a/storage/innobase/trx/trx0trx.c
++++ b/storage/innobase/trx/trx0trx.c
 @@ -138,6 +138,10 @@
  
  	trx->mysql_log_file_name = NULL;
 
=== modified file 'patches/innodb_pass_corrupt_table.patch'
--- patches/innodb_pass_corrupt_table.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_pass_corrupt_table.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
---- a/storage/innobase/btr/btr0btr.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/btr/btr0btr.c	2010-12-04 15:38:18.110513593 +0900
+--- a/storage/innobase/btr/btr0btr.c
++++ b/storage/innobase/btr/btr0btr.c
 @@ -691,6 +691,12 @@
  	root_page_no = dict_index_get_page(index);
  
@@ -73,9 +72,8 @@
  	btr_search_drop_page_hash_index(block);
  
  	header = buf_block_get_frame(block) + PAGE_HEADER + PAGE_BTR_SEG_TOP;
-diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
---- a/storage/innobase/btr/btr0cur.c	2010-12-03 17:30:16.239038936 +0900
-+++ b/storage/innobase/btr/btr0cur.c	2010-12-04 15:38:18.114551906 +0900
+--- a/storage/innobase/btr/btr0cur.c
++++ b/storage/innobase/btr/btr0cur.c
 @@ -250,6 +250,11 @@
  	case BTR_MODIFY_LEAF:
  		mode = latch_mode == BTR_SEARCH_LEAF ? RW_S_LATCH : RW_X_LATCH;
@@ -255,9 +253,8 @@
  		rec = page_rec_get_next(page_get_infimum_rec(page));
  
  		if (!page_rec_is_supremum(rec)) {
-diff -ruN a/storage/innobase/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c
---- a/storage/innobase/btr/btr0pcur.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/btr/btr0pcur.c	2010-12-04 15:38:18.116563877 +0900
+--- a/storage/innobase/btr/btr0pcur.c
++++ b/storage/innobase/btr/btr0pcur.c
 @@ -32,7 +32,7 @@
  #include "ut0byte.h"
  #include "rem0cmp.h"
@@ -296,9 +293,8 @@
  #ifdef UNIV_BTR_DEBUG
  	ut_a(page_is_comp(next_page) == page_is_comp(page));
  	ut_a(btr_page_get_prev(next_page, mtr)
-diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
---- a/storage/innobase/btr/btr0sea.c	2010-12-03 15:49:59.166193407 +0900
-+++ b/storage/innobase/btr/btr0sea.c	2010-12-04 15:38:18.118548961 +0900
+--- a/storage/innobase/btr/btr0sea.c
++++ b/storage/innobase/btr/btr0sea.c
 @@ -42,7 +42,7 @@
  #include "btr0pcur.h"
  #include "btr0btr.h"
@@ -320,9 +316,8 @@
  	/* NOTE that the following two function calls do NOT protect
  	info or block->n_fields etc. with any semaphore, to save CPU time!
  	We cannot assume the fields are consistent when we return from
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-04 15:37:50.554565654 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-04 15:38:18.119548922 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -52,6 +52,7 @@
  #include "log0recv.h"
  #include "page0zip.h"
@@ -431,9 +426,8 @@
  				TRUE);
  		}
  	}
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2010-12-04 15:37:50.557553380 +0900
-+++ b/storage/innobase/buf/buf0rea.c	2010-12-04 15:41:09.784467585 +0900
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -193,7 +193,14 @@
  			      ((buf_block_t*) bpage)->frame, bpage, trx);
  	}
@@ -449,9 +443,8 @@
  
  	if (sync) {
  		/* The i/o is already completed when we arrive from
-diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
---- a/storage/innobase/dict/dict0dict.c	2010-12-03 17:30:16.248987063 +0900
-+++ b/storage/innobase/dict/dict0dict.c	2010-12-04 15:45:23.808513973 +0900
+--- a/storage/innobase/dict/dict0dict.c
++++ b/storage/innobase/dict/dict0dict.c
 @@ -54,6 +54,7 @@
  #include "row0merge.h"
  #include "m_ctype.h" /* my_isspace() */
@@ -561,9 +554,8 @@
 +	}
 +}
  #endif /* !UNIV_HOTBACKUP */
-diff -ruN a/storage/innobase/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c
---- a/storage/innobase/dict/dict0mem.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/dict/dict0mem.c	2010-12-04 15:38:18.126549463 +0900
+--- a/storage/innobase/dict/dict0mem.c
++++ b/storage/innobase/dict/dict0mem.c
 @@ -96,6 +96,8 @@
  	/* The number of transactions that are either waiting on the
  	AUTOINC lock or have been granted the lock. */
@@ -573,9 +565,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  	ut_d(table->magic_n = DICT_TABLE_MAGIC_N);
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-12-04 15:37:50.564551587 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-04 15:38:18.128549252 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -235,6 +235,7 @@
  				file we have written to */
  	ibool		is_in_unflushed_spaces; /*!< TRUE if this space is
@@ -684,9 +675,8 @@
 +	mutex_exit(&fil_system->mutex);
 +}
 +
-diff -ruN a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c
---- a/storage/innobase/fsp/fsp0fsp.c	2010-12-04 15:37:50.569480615 +0900
-+++ b/storage/innobase/fsp/fsp0fsp.c	2010-12-04 15:38:18.131550103 +0900
+--- a/storage/innobase/fsp/fsp0fsp.c
++++ b/storage/innobase/fsp/fsp0fsp.c
 @@ -369,6 +369,12 @@
  	ut_ad(id || !zip_size);
  
@@ -795,9 +785,8 @@
  	descr = fseg_get_first_extent(inode, space, zip_size, mtr);
  
  	if (descr != NULL) {
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:37:50.578486593 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:38:18.137549396 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -3972,6 +3972,12 @@
  		DBUG_RETURN(1);
  	}
@@ -1073,9 +1062,8 @@
    NULL
  };
  
-diff -ruN a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
---- a/storage/innobase/handler/ha_innodb.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/handler/ha_innodb.h	2010-12-04 15:38:18.159588579 +0900
+--- a/storage/innobase/handler/ha_innodb.h
++++ b/storage/innobase/handler/ha_innodb.h
 @@ -52,6 +52,7 @@
  	innodb_idx_translate_t	idx_trans_tbl;	/*!< index translation
  						table between MySQL and
@@ -1092,9 +1080,8 @@
  
  	int write_row(uchar * buf);
  	int update_row(const uchar * old_data, uchar * new_data);
-diff -ruN a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic
---- a/storage/innobase/include/btr0btr.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/btr0btr.ic	2010-12-04 15:38:18.162515035 +0900
+--- a/storage/innobase/include/btr0btr.ic
++++ b/storage/innobase/include/btr0btr.ic
 @@ -28,7 +28,7 @@
  #include "mtr0mtr.h"
  #include "mtr0log.h"
@@ -1115,9 +1102,8 @@
  
  		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
  	}
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2010-12-03 15:49:59.218956083 +0900
-+++ b/storage/innobase/include/buf0buf.h	2010-12-04 15:38:18.164513667 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -986,7 +986,7 @@
  	const buf_block_t*	block)	/*!< in: pointer to the control block */
  	__attribute__((pure));
@@ -1135,9 +1121,8 @@
  # if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
  	ibool		file_page_was_freed;
  					/*!< this is set to TRUE when fsp
-diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
---- a/storage/innobase/include/buf0buf.ic	2010-12-03 15:49:59.221956024 +0900
-+++ b/storage/innobase/include/buf0buf.ic	2010-12-04 15:38:18.167513925 +0900
+--- a/storage/innobase/include/buf0buf.ic
++++ b/storage/innobase/include/buf0buf.ic
 @@ -34,7 +34,7 @@
  #include "buf0flu.h"
  #include "buf0lru.h"
@@ -1160,9 +1145,8 @@
  	ut_ad(block);
  
  	switch (buf_block_get_state(block)) {
-diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
---- a/storage/innobase/include/dict0dict.h	2010-12-03 17:30:16.306955940 +0900
-+++ b/storage/innobase/include/dict0dict.h	2010-12-04 15:38:18.169513750 +0900
+--- a/storage/innobase/include/dict0dict.h
++++ b/storage/innobase/include/dict0dict.h
 @@ -1245,6 +1245,15 @@
  dict_close(void);
  /*============*/
@@ -1179,9 +1163,8 @@
  #ifndef UNIV_NONINL
  #include "dict0dict.ic"
  #endif
-diff -ruN a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
---- a/storage/innobase/include/dict0mem.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/dict0mem.h	2010-12-04 15:38:18.171513956 +0900
+--- a/storage/innobase/include/dict0mem.h
++++ b/storage/innobase/include/dict0mem.h
 @@ -640,6 +640,7 @@
  				the AUTOINC lock on this table. */
  				/* @} */
@@ -1190,9 +1173,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  #ifdef UNIV_DEBUG
-diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
---- a/storage/innobase/include/fil0fil.h	2010-12-04 15:35:29.175520016 +0900
-+++ b/storage/innobase/include/fil0fil.h	2010-12-04 15:38:18.172483391 +0900
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
 @@ -750,6 +750,19 @@
  fil_system_hash_nodes(void);
  /*========================*/
@@ -1213,9 +1195,8 @@
  typedef	struct fil_space_struct	fil_space_t;
  
  #endif
-diff -ruN a/storage/innobase/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic
---- a/storage/innobase/include/fut0fut.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/fut0fut.ic	2010-12-04 15:38:18.174481728 +0900
+--- a/storage/innobase/include/fut0fut.ic
++++ b/storage/innobase/include/fut0fut.ic
 @@ -23,6 +23,7 @@
  Created 12/13/1995 Heikki Tuuri
  ***********************************************************************/
@@ -1237,9 +1218,8 @@
  	ptr = buf_block_get_frame(block) + addr.boffset;
  
  	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-diff -ruN a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h
---- a/storage/innobase/include/page0page.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/page0page.h	2010-12-04 15:38:18.175514037 +0900
+--- a/storage/innobase/include/page0page.h
++++ b/storage/innobase/include/page0page.h
 @@ -500,7 +500,7 @@
  page_is_leaf(
  /*=========*/
@@ -1249,9 +1229,8 @@
  /************************************************************//**
  Gets the pointer to the next record on the page.
  @return	pointer to next record */
-diff -ruN a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic
---- a/storage/innobase/include/page0page.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/page0page.ic	2010-12-04 15:38:18.177482672 +0900
+--- a/storage/innobase/include/page0page.ic
++++ b/storage/innobase/include/page0page.ic
 @@ -274,6 +274,9 @@
  /*=========*/
  	const page_t*	page)	/*!< in: page */
@@ -1262,9 +1241,8 @@
  	return(!*(const uint16*) (page + (PAGE_HEADER + PAGE_LEVEL)));
  }
  
-diff -ruN a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h
---- a/storage/innobase/include/page0zip.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/page0zip.h	2010-12-04 15:38:18.179513974 +0900
+--- a/storage/innobase/include/page0zip.h
++++ b/storage/innobase/include/page0zip.h
 @@ -114,7 +114,7 @@
  	const page_t*	page,	/*!< in: uncompressed page */
  	dict_index_t*	index,	/*!< in: index of the B-tree node */
@@ -1274,9 +1252,8 @@
  
  /**********************************************************************//**
  Decompress a page.  This function should tolerate errors on the compressed
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-04 15:37:50.591516341 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-04 15:38:18.180563749 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -240,6 +240,7 @@
  extern ulint	srv_adaptive_flushing_method;
  
@@ -1285,9 +1262,8 @@
  
  extern ulint	srv_dict_size_limit;
  /*-------------------------------------------*/
-diff -ruN a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c
---- a/storage/innobase/page/page0zip.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/page/page0zip.c	2010-12-04 15:38:18.195515935 +0900
+--- a/storage/innobase/page/page0zip.c
++++ b/storage/innobase/page/page0zip.c
 @@ -1153,6 +1153,10 @@
  	FILE*		logfile = NULL;
  #endif
@@ -1299,9 +1275,8 @@
  	ut_a(page_is_comp(page));
  	ut_a(fil_page_get_type(page) == FIL_PAGE_INDEX);
  	ut_ad(page_simple_validate_new((page_t*) page));
-diff -ruN a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c
---- a/storage/innobase/row/row0ins.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/row/row0ins.c	2010-12-04 15:38:18.198514028 +0900
+--- a/storage/innobase/row/row0ins.c
++++ b/storage/innobase/row/row0ins.c
 @@ -1335,6 +1335,12 @@
  		const rec_t*		rec = btr_pcur_get_rec(&pcur);
  		const buf_block_t*	block = btr_pcur_get_block(&pcur);
@@ -1315,9 +1290,8 @@
  		if (page_rec_is_infimum(rec)) {
  
  			continue;
-diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c
---- a/storage/innobase/row/row0merge.c	2010-12-03 17:30:16.330986655 +0900
-+++ b/storage/innobase/row/row0merge.c	2010-12-04 15:38:18.201513966 +0900
+--- a/storage/innobase/row/row0merge.c
++++ b/storage/innobase/row/row0merge.c
 @@ -1245,6 +1245,13 @@
  
  		if (UNIV_LIKELY(has_next)) {
@@ -1332,9 +1306,8 @@
  			offsets = rec_get_offsets(rec, clust_index, NULL,
  						  ULINT_UNDEFINED, &row_heap);
  
-diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
---- a/storage/innobase/row/row0sel.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/row/row0sel.c	2010-12-04 15:38:18.205551115 +0900
+--- a/storage/innobase/row/row0sel.c
++++ b/storage/innobase/row/row0sel.c
 @@ -3853,6 +3853,13 @@
  	/* PHASE 4: Look for matching records in a loop */
  
@@ -1374,9 +1347,8 @@
  		if (!rec_validate(rec, offsets)
  		    || !btr_index_rec_validate(rec, index, FALSE)) {
  			fprintf(stderr,
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-04 15:37:50.602481253 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-04 15:38:18.209513823 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -430,6 +430,7 @@
  UNIV_INTERN ulint	srv_adaptive_flushing_method = 0; /* 0: native  1: estimate  2: keep_average */
  
@@ -1385,9 +1357,8 @@
  
  UNIV_INTERN ulint	srv_dict_size_limit = 0;
  /*-------------------------------------------*/
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
---- a/storage/innobase/srv/srv0start.c	2010-12-04 15:37:50.605491300 +0900
-+++ b/storage/innobase/srv/srv0start.c	2010-12-04 15:38:18.212513722 +0900
+--- a/storage/innobase/srv/srv0start.c
++++ b/storage/innobase/srv/srv0start.c
 @@ -2149,6 +2149,13 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);
 
=== modified file 'patches/innodb_recovery_patches.patch'
--- patches/innodb_recovery_patches.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_recovery_patches.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2010-12-03 15:49:59.187028943 +0900
-+++ b/storage/innobase/buf/buf0rea.c	2010-12-03 17:30:41.579956150 +0900
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -122,6 +122,46 @@
  	bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
  				       tablespace_version, offset);
@@ -106,9 +105,8 @@
  		return;
  	}
  
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:30:16.261955714 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:30:41.584971130 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -182,6 +182,7 @@
  #endif /* UNIV_LOG_ARCHIVE */
  static my_bool	innobase_use_doublewrite		= TRUE;
@@ -146,9 +144,8 @@
    MYSQL_SYSVAR(fast_shutdown),
    MYSQL_SYSVAR(file_io_threads),
    MYSQL_SYSVAR(read_io_threads),
-diff -ruN a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h
---- a/storage/innobase/include/log0recv.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/log0recv.h	2010-12-03 17:30:41.592958318 +0900
+--- a/storage/innobase/include/log0recv.h
++++ b/storage/innobase/include/log0recv.h
 @@ -438,6 +438,39 @@
  	hash_table_t*	addr_hash;/*!< hash table of file addresses of pages */
  	ulint		n_addrs;/*!< number of not processed hashed file
@@ -189,9 +186,8 @@
  };
  
  /** The recovery system */
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-03 17:30:16.321953515 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-03 17:30:41.593985184 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -126,6 +126,8 @@
  extern ulint*	srv_data_file_sizes;
  extern ulint*	srv_data_file_is_raw_partition;
@@ -201,9 +197,8 @@
  extern ibool	srv_auto_extend_last_data_file;
  extern ulint	srv_last_file_size_max;
  extern char**	srv_log_group_home_dirs;
-diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
---- a/storage/innobase/log/log0recv.c	2010-12-03 15:18:48.903987466 +0900
-+++ b/storage/innobase/log/log0recv.c	2010-12-03 17:30:41.598022536 +0900
+--- a/storage/innobase/log/log0recv.c
++++ b/storage/innobase/log/log0recv.c
 @@ -187,6 +187,9 @@
  
  	recv_sys->heap = NULL;
@@ -430,9 +425,8 @@
  	if (recv_needed_recovery) {
  		trx_sys_print_mysql_master_log_pos();
  		trx_sys_print_mysql_binlog_offset();
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
---- a/storage/innobase/os/os0file.c	2010-12-03 15:18:48.908955759 +0900
-+++ b/storage/innobase/os/os0file.c	2010-12-03 17:30:41.602022989 +0900
+--- a/storage/innobase/os/os0file.c
++++ b/storage/innobase/os/os0file.c
 @@ -43,6 +43,7 @@
  #include "srv0start.h"
  #include "fil0fil.h"
@@ -441,7 +435,7 @@
  #ifndef UNIV_HOTBACKUP
  # include "os0sync.h"
  # include "os0thread.h"
-@@ -4270,6 +4271,18 @@
+@@ -4271,6 +4272,18 @@
  					   INFINITE);
  	}
  
@@ -460,9 +454,8 @@
  	os_mutex_enter(array->mutex);
  
  	if (srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 17:30:16.339955597 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 17:30:41.604958138 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -160,6 +160,8 @@
  /* size in database pages */
  UNIV_INTERN ulint*	srv_data_file_sizes = NULL;
@@ -472,9 +465,8 @@
  /* if TRUE, then we auto-extend the last data file */
  UNIV_INTERN ibool	srv_auto_extend_last_data_file	= FALSE;
  /* if != 0, this tells the max size auto-extending may increase the
-diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
---- a/storage/innobase/trx/trx0sys.c	2010-12-03 15:41:52.051986524 +0900
-+++ b/storage/innobase/trx/trx0sys.c	2010-12-03 17:30:41.607026818 +0900
+--- a/storage/innobase/trx/trx0sys.c
++++ b/storage/innobase/trx/trx0sys.c
 @@ -567,6 +567,12 @@
  			       zip_size ? zip_size : UNIV_PAGE_SIZE,
  			       read_buf, NULL);
 
=== modified file 'patches/innodb_separate_doublewrite.patch'
--- patches/innodb_separate_doublewrite.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_separate_doublewrite.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-03 17:49:11.574962867 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-04 15:35:58.624514033 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -4291,7 +4291,8 @@
  		read_space_id = mach_read_from_4(
  			frame + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
@@ -18,9 +17,8 @@
  		    && trx_doublewrite_page_inside(bpage->offset)) {
  
  			ut_print_timestamp(stderr);
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
---- a/storage/innobase/buf/buf0flu.c	2010-12-03 15:49:59.179956111 +0900
-+++ b/storage/innobase/buf/buf0flu.c	2010-12-04 15:35:58.624514033 +0900
+--- a/storage/innobase/buf/buf0flu.c
++++ b/storage/innobase/buf/buf0flu.c
 @@ -791,7 +791,8 @@
  	write_buf = trx_doublewrite->write_buf;
  	i = 0;
@@ -50,9 +48,8 @@
  
  	/* We know that the writes have been flushed to disk now
  	and in recovery we will find them in the doublewrite buffer
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2010-12-04 15:35:29.138514157 +0900
-+++ b/storage/innobase/buf/buf0rea.c	2010-12-04 15:35:58.626486771 +0900
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -88,7 +88,9 @@
  	wake_later = mode & OS_AIO_SIMULATED_WAKE_LATER;
  	mode = mode & ~OS_AIO_SIMULATED_WAKE_LATER;
@@ -64,9 +61,8 @@
  	    && (   (offset >= trx_doublewrite->block1
  		    && offset < trx_doublewrite->block1
  		    + TRX_SYS_DOUBLEWRITE_BLOCK_SIZE)
-diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c
---- a/storage/innobase/dict/dict0load.c	2010-12-03 17:30:16.252956569 +0900
-+++ b/storage/innobase/dict/dict0load.c	2010-12-04 15:35:58.627482825 +0900
+--- a/storage/innobase/dict/dict0load.c
++++ b/storage/innobase/dict/dict0load.c
 @@ -41,6 +41,7 @@
  #include "srv0start.h"
  #include "srv0srv.h"
@@ -102,9 +98,8 @@
  		/* The system tablespace is always available. */
  	} else if (!fil_space_for_table_exists_in_mem(
  			   table->space, name,
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-12-04 15:35:29.143813775 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-04 15:35:58.628498870 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -657,7 +657,7 @@
  
  	UT_LIST_ADD_LAST(chain, space->chain, node);
@@ -312,9 +307,8 @@
  
  		fil_node = UT_LIST_GET_NEXT(LRU, fil_node);
  	}
-diff -ruN a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c
---- a/storage/innobase/fsp/fsp0fsp.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/fsp/fsp0fsp.c	2010-12-04 15:35:58.632513243 +0900
+--- a/storage/innobase/fsp/fsp0fsp.c
++++ b/storage/innobase/fsp/fsp0fsp.c
 @@ -48,7 +48,7 @@
  # include "log0log.h"
  #endif /* UNIV_HOTBACKUP */
@@ -337,9 +331,8 @@
  			   dict_ind_redundant, mtr);
  	} else {
  		fsp_fill_free_list(TRUE, space, header, mtr);
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:35:29.153514047 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 15:35:58.636549909 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -163,6 +163,7 @@
  static char*	innobase_log_group_home_dir		= NULL;
  static char*	innobase_file_format_name		= NULL;
@@ -377,9 +370,8 @@
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),
    MYSQL_SYSVAR(recovery_stats),
-diff -ruN a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
---- a/storage/innobase/include/mtr0log.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/mtr0log.ic	2010-12-04 15:35:58.644607059 +0900
+--- a/storage/innobase/include/mtr0log.ic
++++ b/storage/innobase/include/mtr0log.ic
 @@ -27,8 +27,8 @@
  #include "ut0lst.h"
  #include "buf0buf.h"
@@ -400,9 +392,8 @@
  	    && offset >= FSP_EXTENT_SIZE && offset < 3 * FSP_EXTENT_SIZE) {
  		if (trx_doublewrite_buf_is_being_created) {
  			/* Do nothing: we only come to this branch in an
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-04 15:35:29.177480351 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-04 15:35:58.646556250 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -129,6 +129,8 @@
  extern ulint*	srv_data_file_sizes;
  extern ulint*	srv_data_file_is_raw_partition;
@@ -412,9 +403,8 @@
  extern ibool	srv_recovery_stats;
  
  extern ibool	srv_auto_extend_last_data_file;
-diff -ruN a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
---- a/storage/innobase/include/srv0start.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/srv0start.h	2010-12-08 17:15:07.602605797 +0900
+--- a/storage/innobase/include/srv0start.h
++++ b/storage/innobase/include/srv0start.h
 @@ -127,4 +127,7 @@
  /** Log 'spaces' have id's >= this */
  #define SRV_LOG_SPACE_FIRST_ID		0xFFFFFFF0UL
@@ -423,9 +413,8 @@
 +#define SRV_EXTRA_SYS_SPACE_FIRST_ID	0xFFFFFFE0UL
 +
  #endif
-diff -ruN a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
---- a/storage/innobase/include/trx0sys.h	2010-12-03 15:41:52.047049291 +0900
-+++ b/storage/innobase/include/trx0sys.h	2010-12-04 15:35:58.647551222 +0900
+--- a/storage/innobase/include/trx0sys.h
++++ b/storage/innobase/include/trx0sys.h
 @@ -125,6 +125,22 @@
  /*=============*/
  	ulint	space,	/*!< in: space */
@@ -472,9 +461,8 @@
  #include "fsp0fsp.h"
  #define	TRX_SYS_PAGE_NO	FSP_TRX_SYS_PAGE_NO
  
-diff -ruN a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic
---- a/storage/innobase/include/trx0sys.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/trx0sys.ic	2010-12-04 15:35:58.649473284 +0900
+--- a/storage/innobase/include/trx0sys.ic
++++ b/storage/innobase/include/trx0sys.ic
 @@ -71,6 +71,40 @@
  }
  
@@ -516,9 +504,8 @@
  Gets the pointer in the nth slot of the rseg array.
  @return	pointer to rseg object, NULL if slot not in use */
  UNIV_INLINE
-diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
---- a/storage/innobase/row/row0mysql.c	2010-12-03 17:30:16.334989510 +0900
-+++ b/storage/innobase/row/row0mysql.c	2010-12-04 15:35:58.652496484 +0900
+--- a/storage/innobase/row/row0mysql.c
++++ b/storage/innobase/row/row0mysql.c
 @@ -3447,7 +3447,7 @@
  		/* Do not drop possible .ibd tablespace if something went
  		wrong: we do not want to delete valuable data of the user */
@@ -528,9 +515,8 @@
  			if (!fil_space_for_table_exists_in_mem(space_id,
  							       name_or_path,
  							       is_temp, FALSE,
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-04 15:35:29.180483212 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-04 15:35:58.656550107 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -163,6 +163,8 @@
  /* size in database pages */
  UNIV_INTERN ulint*	srv_data_file_sizes = NULL;
@@ -540,9 +526,8 @@
  UNIV_INTERN ibool	srv_recovery_stats = FALSE;
  
  /* if TRUE, then we auto-extend the last data file */
-diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
---- a/storage/innobase/srv/srv0start.c	2010-12-04 15:35:29.183481330 +0900
-+++ b/storage/innobase/srv/srv0start.c	2010-12-04 15:35:58.661550545 +0900
+--- a/storage/innobase/srv/srv0start.c
++++ b/storage/innobase/srv/srv0start.c
 @@ -714,6 +714,7 @@
  /*======================*/
  	ibool*		create_new_db,	/*!< out: TRUE if new database should be
@@ -765,9 +750,8 @@
  	}
  
  	if (!create_new_db && sum_of_new_sizes > 0) {
-diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
---- a/storage/innobase/trx/trx0sys.c	2010-12-03 17:32:15.651024019 +0900
-+++ b/storage/innobase/trx/trx0sys.c	2010-12-04 15:35:58.664550291 +0900
+--- a/storage/innobase/trx/trx0sys.c
++++ b/storage/innobase/trx/trx0sys.c
 @@ -415,6 +415,152 @@
  
  		goto start_again;
 
=== modified file 'patches/innodb_show_lock_name.patch'
--- patches/innodb_show_lock_name.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_show_lock_name.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:34:35.285040381 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:35:12.974975252 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -9593,9 +9593,8 @@
  			rw_lock_wait_time += mutex->lspent_time;
  		}
@@ -58,9 +57,8 @@
  		buf2len = (uint) my_snprintf(buf2, sizeof buf2,
  					     "os_waits=%lu",
  					     (ulong) block_lock_oswait_count);
-diff -ruN a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
---- a/storage/innobase/include/sync0rw.h	2010-12-03 15:49:59.225953164 +0900
-+++ b/storage/innobase/include/sync0rw.h	2010-12-03 17:35:12.978024458 +0900
+--- a/storage/innobase/include/sync0rw.h
++++ b/storage/innobase/include/sync0rw.h
 @@ -138,14 +138,14 @@
  # ifdef UNIV_DEBUG
  #  ifdef UNIV_SYNC_DEBUG
@@ -144,9 +142,8 @@
  
  /******************************************************************//**
  Performance schema instrumented wrap function for rw_lock_x_lock_func()
-diff -ruN a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
---- a/storage/innobase/include/sync0rw.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/sync0rw.ic	2010-12-03 17:35:12.980024605 +0900
+--- a/storage/innobase/include/sync0rw.ic
++++ b/storage/innobase/include/sync0rw.ic
 @@ -640,10 +640,10 @@
  #  ifdef UNIV_SYNC_DEBUG
  	ulint		level,		/*!< in: level */
@@ -175,9 +172,8 @@
  }
  /******************************************************************//**
  Performance schema instrumented wrap function for rw_lock_x_lock_func()
-diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
---- a/storage/innobase/include/sync0sync.h	2010-12-03 15:49:59.227955503 +0900
-+++ b/storage/innobase/include/sync0sync.h	2010-12-03 17:35:12.982023946 +0900
+--- a/storage/innobase/include/sync0sync.h
++++ b/storage/innobase/include/sync0sync.h
 @@ -158,14 +158,14 @@
  # ifdef UNIV_DEBUG
  #  ifdef UNIV_SYNC_DEBUG
@@ -270,9 +266,8 @@
  #ifdef UNIV_PFS_MUTEX
  	struct PSI_mutex* pfs_psi;	/*!< The performance schema
  					instrumentation hook */
-diff -ruN a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
---- a/storage/innobase/include/sync0sync.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/sync0sync.ic	2010-12-03 17:35:12.984024599 +0900
+--- a/storage/innobase/include/sync0sync.ic
++++ b/storage/innobase/include/sync0sync.ic
 @@ -321,13 +321,13 @@
  	mysql_pfs_key_t	key,		/*!< in: Performance Schema key */
  	mutex_t*	mutex,		/*!< in: pointer to memory */
@@ -307,9 +302,8 @@
  }
  /******************************************************************//**
  NOTE! Please use the corresponding macro mutex_free(), not directly
-diff -ruN a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
---- a/storage/innobase/sync/sync0arr.c	2010-12-03 15:09:51.304953409 +0900
-+++ b/storage/innobase/sync/sync0arr.c	2010-12-03 17:35:12.985024561 +0900
+--- a/storage/innobase/sync/sync0arr.c
++++ b/storage/innobase/sync/sync0arr.c
 @@ -489,13 +489,12 @@
  		mutex = cell->old_wait_mutex;
  
@@ -338,9 +332,8 @@
  		writer = rw_lock_get_writer(rwlock);
  		if (writer != RW_LOCK_NOT_LOCKED) {
  			fprintf(file,
-diff -ruN a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
---- a/storage/innobase/sync/sync0rw.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/sync/sync0rw.c	2010-12-03 17:35:12.987029059 +0900
+--- a/storage/innobase/sync/sync0rw.c
++++ b/storage/innobase/sync/sync0rw.c
 @@ -242,10 +242,10 @@
  # ifdef UNIV_SYNC_DEBUG
  	ulint		level,		/*!< in: level */
@@ -439,9 +432,8 @@
  	}
  
  	/* these stats may not be accurate */
-diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
---- a/storage/innobase/sync/sync0sync.c	2010-12-03 15:49:59.233955565 +0900
-+++ b/storage/innobase/sync/sync0sync.c	2010-12-03 17:35:12.989024400 +0900
+--- a/storage/innobase/sync/sync0sync.c
++++ b/storage/innobase/sync/sync0sync.c
 @@ -270,13 +270,13 @@
  /*==============*/
  	mutex_t*	mutex,		/*!< in: pointer to memory */
 
=== modified file 'patches/innodb_show_status.patch'
--- patches/innodb_show_status.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_show_status.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-03 15:07:31.786968193 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -4831,6 +4831,7 @@
  	}
  
@@ -47,9 +46,8 @@
  		pool_info->free_list_len,
  		pool_info->lru_len,
  		pool_info->old_lru_len,
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
---- a/storage/innobase/buf/buf0flu.c	2010-12-03 20:58:26.000000000 +0300
-+++ b/storage/innobase/buf/buf0flu.c	2011-01-07 03:37:41.000000000 +0300
+--- a/storage/innobase/buf/buf0flu.c
++++ b/storage/innobase/buf/buf0flu.c
 @@ -75,7 +75,7 @@
  static buf_flush_stat_t	buf_flush_stat_sum;
  
@@ -59,9 +57,8 @@
  
  /* @} */
  
-diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
---- a/storage/innobase/fil/fil0fil.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/fil/fil0fil.c	2010-12-03 15:07:31.790357112 +0900
+--- a/storage/innobase/fil/fil0fil.c
++++ b/storage/innobase/fil/fil0fil.c
 @@ -4888,3 +4888,30 @@
  
  	fil_system = NULL;
@@ -93,9 +90,8 @@
 +               return 0;
 +       }
 +}
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:06:58.727955654 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:07:31.799376984 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -603,6 +603,8 @@
    (char*) &export_vars.innodb_buffer_pool_pages_dirty,	  SHOW_LONG},
    {"buffer_pool_pages_flushed",
@@ -140,9 +136,8 @@
    MYSQL_SYSVAR(version),
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(use_native_aio),
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2011-01-20 07:37:08.000000000 +0900
-+++ b/storage/innobase/include/buf0buf.h	2011-02-14 15:25:20.859126532 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -125,6 +125,7 @@
  	/* General buffer pool info */
  	ulint	pool_unique_id;		/*!< Buffer Pool ID */
@@ -151,9 +146,8 @@
  	ulint	lru_len;		/*!< Length of buf_pool->LRU */
  	ulint	old_lru_len;		/*!< buf_pool->LRU_old_len */
  	ulint	free_list_len;		/*!< Length of buf_pool->free list */
-diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
---- a/storage/innobase/include/fil0fil.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/fil0fil.h	2010-12-03 15:07:31.812028575 +0900
+--- a/storage/innobase/include/fil0fil.h
++++ b/storage/innobase/include/fil0fil.h
 @@ -726,6 +726,17 @@
  /*============================*/
  	ulint		id);	/*!< in: space id */
@@ -172,9 +166,8 @@
  typedef	struct fil_space_struct	fil_space_t;
  
  #endif
-diff -ruN a/storage/innobase/include/read0read.h b/storage/innobase/include/read0read.h
---- a/storage/innobase/include/read0read.h	2010-12-04 02:58:26.000000000 +0900
-+++ b/storage/innobase/include/read0read.h	2011-01-21 19:35:44.127631727 +0900
+--- a/storage/innobase/include/read0read.h
++++ b/storage/innobase/include/read0read.h
 @@ -88,6 +88,7 @@
  void
  read_view_print(
@@ -183,9 +176,8 @@
  	const read_view_t*	view);	/*!< in: read view */
  /*********************************************************************//**
  Create a consistent cursor view for mysql to be used in cursors. In this
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-03 15:07:31.813958103 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -142,6 +142,9 @@
  extern char	srv_adaptive_flushing;
  
@@ -213,9 +205,8 @@
  	ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */
  	ulint innodb_buffer_pool_read_ahead;	/*!< srv_read_ahead */
  	ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
-diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
---- a/storage/innobase/lock/lock0lock.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/lock/lock0lock.c	2010-12-03 15:07:31.819023998 +0900
+--- a/storage/innobase/lock/lock0lock.c
++++ b/storage/innobase/lock/lock0lock.c
 @@ -4374,6 +4374,7 @@
  
  	putc('\n', file);
@@ -252,9 +243,8 @@
  		      " SUPPRESSING FURTHER PRINTS\n",
  		      file);
  
-diff -ruN a/storage/innobase/read/read0read.c b/storage/innobase/read/read0read.c
---- a/storage/innobase/read/read0read.c	2010-12-04 02:58:26.000000000 +0900
-+++ b/storage/innobase/read/read0read.c	2011-01-21 19:37:08.292650181 +0900
+--- a/storage/innobase/read/read0read.c
++++ b/storage/innobase/read/read0read.c
 @@ -357,34 +357,35 @@
  void
  read_view_print(
@@ -298,9 +288,8 @@
  			(ullint) read_view_get_nth_trx_id(view, i));
  	}
  }
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 15:07:31.824022673 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -83,6 +83,7 @@
  #include "ha_prototypes.h"
  #include "trx0i_s.h"
@@ -513,9 +502,8 @@
  	export_vars.innodb_buffer_pool_reads = srv_buf_pool_reads;
  	export_vars.innodb_buffer_pool_read_ahead
  		= stat.n_ra_pages_read;
-diff -ruN a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
---- a/storage/innobase/sync/sync0arr.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/sync/sync0arr.c	2010-12-03 15:07:31.826041368 +0900
+--- a/storage/innobase/sync/sync0arr.c
++++ b/storage/innobase/sync/sync0arr.c
 @@ -478,7 +478,7 @@
  
  	fprintf(file,
@@ -525,9 +513,8 @@
  		(ulong) os_thread_pf(cell->thread),
  		innobase_basename(cell->file), (ulong) cell->line,
  		difftime(time(NULL), cell->reservation_time));
-diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
---- a/storage/innobase/trx/trx0purge.c	2010-12-04 02:58:26.000000000 +0900
-+++ b/storage/innobase/trx/trx0purge.c	2011-01-21 19:40:42.086683671 +0900
+--- a/storage/innobase/trx/trx0purge.c
++++ b/storage/innobase/trx/trx0purge.c
 @@ -1212,7 +1212,7 @@
  /*=====================*/
  {
 
=== modified file 'patches/innodb_show_status_extend.patch'
--- patches/innodb_show_status_extend.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_show_status_extend.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2011-01-21 19:53:42.369599743 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2011-01-21 19:54:44.659599699 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -638,6 +638,16 @@
  	trx_t*	trx);	/*!< in: transaction handle */
  
@@ -156,9 +155,8 @@
    {NullS, NullS, SHOW_LONG}
  };
  
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
---- a/storage/innobase/ibuf/ibuf0ibuf.c	2011-02-03 15:05:04.000000000 +0900
-+++ b/storage/innobase/ibuf/ibuf0ibuf.c	2011-02-03 15:19:47.000000000 +0900
+--- a/storage/innobase/ibuf/ibuf0ibuf.c
++++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -469,6 +469,45 @@
  }
  
@@ -205,9 +203,8 @@
  Updates the size information of the ibuf, assuming the segment size has not
  changed. */
  static
-diff -ruN a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
---- a/storage/innobase/include/ibuf0ibuf.h	2010-12-04 02:58:26.000000000 +0900
-+++ b/storage/innobase/include/ibuf0ibuf.h	2011-02-03 15:19:47.000000000 +0900
+--- a/storage/innobase/include/ibuf0ibuf.h
++++ b/storage/innobase/include/ibuf0ibuf.h
 @@ -438,6 +438,22 @@
  void
  ibuf_close(void);
@@ -231,9 +228,8 @@
  
  #define IBUF_HEADER_PAGE_NO	FSP_IBUF_HEADER_PAGE_NO
  #define IBUF_TREE_ROOT_PAGE_NO	FSP_IBUF_TREE_ROOT_PAGE_NO
-diff -ruN a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
---- a/storage/innobase/include/lock0lock.h	2011-01-21 19:52:38.967683738 +0900
-+++ b/storage/innobase/include/lock0lock.h	2011-01-21 19:54:44.660599140 +0900
+--- a/storage/innobase/include/lock0lock.h
++++ b/storage/innobase/include/lock0lock.h
 @@ -816,6 +816,7 @@
  /** The lock system struct */
  struct lock_sys_struct{
@@ -242,9 +238,8 @@
  };
  
  /** The lock system */
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2011-01-21 19:53:42.380638228 +0900
-+++ b/storage/innobase/include/srv0srv.h	2011-01-21 19:54:44.662600032 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -731,6 +731,11 @@
  
  /** Status variables to be passed to MySQL */
@@ -339,9 +334,8 @@
  };
  
  /** Thread slot in the thread table */
-diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
---- a/storage/innobase/include/sync0sync.h	2011-01-21 19:48:45.982637372 +0900
-+++ b/storage/innobase/include/sync0sync.h	2011-01-21 19:54:44.664638235 +0900
+--- a/storage/innobase/include/sync0sync.h
++++ b/storage/innobase/include/sync0sync.h
 @@ -769,6 +769,10 @@
  
  #define	SYNC_SPIN_ROUNDS	srv_n_spin_wait_rounds
@@ -353,9 +347,8 @@
  /** The number of mutex_exit calls. Intended for performance monitoring. */
  extern	ib_int64_t	mutex_exit_count;
  
-diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
---- a/storage/innobase/lock/lock0lock.c	2011-01-21 19:52:38.998600121 +0900
-+++ b/storage/innobase/lock/lock0lock.c	2011-01-21 19:54:44.668637536 +0900
+--- a/storage/innobase/lock/lock0lock.c
++++ b/storage/innobase/lock/lock0lock.c
 @@ -571,6 +571,7 @@
  	lock_sys = mem_alloc(sizeof(lock_sys_t));
  
@@ -388,9 +381,8 @@
  
  	UT_LIST_REMOVE(trx_locks, trx->trx_locks, in_lock);
  }
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2011-01-21 19:53:42.390637840 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2011-01-21 19:54:44.673637084 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -2253,12 +2253,49 @@
  	ulint		LRU_len;
  	ulint		free_len;
@@ -534,9 +526,8 @@
  #ifdef HAVE_ATOMIC_BUILTINS
  	export_vars.innodb_have_atomic_builtins = 1;
  #else
-diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
---- a/storage/innobase/sync/sync0sync.c	2011-01-21 19:53:03.458637954 +0900
-+++ b/storage/innobase/sync/sync0sync.c	2011-01-21 19:54:44.676637686 +0900
+--- a/storage/innobase/sync/sync0sync.c
++++ b/storage/innobase/sync/sync0sync.c
 @@ -171,13 +171,13 @@
  
  /** The number of iterations in the mutex_spin_wait() spin loop.
 
=== modified file 'patches/innodb_show_sys_tables.patch'
--- patches/innodb_show_sys_tables.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_show_sys_tables.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c
---- a/storage/innobase/dict/dict0load.c	2011-01-20 07:37:08.000000000 +0900
-+++ b/storage/innobase/dict/dict0load.c	2011-02-14 18:59:40.774162959 +0900
+--- a/storage/innobase/dict/dict0load.c
++++ b/storage/innobase/dict/dict0load.c
 @@ -437,7 +437,7 @@
  
  }
@@ -38,9 +37,8 @@
  
  /********************************************************************//**
  Determine the flags of a table described in SYS_TABLES.
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:53:54.615040167 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 16:07:26.851357007 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -11772,7 +11772,14 @@
  i_s_innodb_cmp,
  i_s_innodb_cmp_reset,
@@ -57,9 +55,8 @@
  mysql_declare_plugin_end;
  
  /** @brief Initialize the default value of innodb_commit_concurrency.
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc	2010-12-03 15:49:59.207956807 +0900
-+++ b/storage/innobase/handler/i_s.cc	2010-12-03 17:10:02.719210529 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -36,9 +36,11 @@
  #include <mysql/innodb_priv.h>
  
@@ -1748,9 +1745,8 @@
  /***********************************************************************
  */
  static ST_FIELD_INFO	i_s_innodb_rseg_fields_info[] =
-diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
---- a/storage/innobase/handler/i_s.h	2010-12-03 15:37:45.540456499 +0900
-+++ b/storage/innobase/handler/i_s.h	2010-12-03 16:08:57.596941207 +0900
+--- a/storage/innobase/handler/i_s.h
++++ b/storage/innobase/handler/i_s.h
 @@ -35,6 +35,13 @@
  extern struct st_mysql_plugin	i_s_innodb_cmp_reset;
  extern struct st_mysql_plugin	i_s_innodb_cmpmem;
 
=== modified file 'patches/innodb_split_buf_pool_mutex.patch'
--- patches/innodb_split_buf_pool_mutex.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_split_buf_pool_mutex.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
---- a/storage/innobase/btr/btr0cur.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/btr/btr0cur.c	2010-12-03 15:48:29.268957148 +0900
+--- a/storage/innobase/btr/btr0cur.c
++++ b/storage/innobase/btr/btr0cur.c
 @@ -4069,7 +4069,8 @@
  
  	mtr_commit(mtr);
@@ -44,9 +43,8 @@
  	mutex_exit(&block->mutex);
  }
  
-diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
---- a/storage/innobase/btr/btr0sea.c	2010-12-03 15:48:03.033037049 +0900
-+++ b/storage/innobase/btr/btr0sea.c	2010-12-03 15:48:29.271024260 +0900
+--- a/storage/innobase/btr/btr0sea.c
++++ b/storage/innobase/btr/btr0sea.c
 @@ -1943,7 +1943,7 @@
  	rec_offs_init(offsets_);
  
@@ -93,9 +91,8 @@
  	rw_lock_x_unlock(&btr_search_latch);
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
-diff -ruN a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c
---- a/storage/innobase/buf/buf0buddy.c	2010-12-03 15:22:36.307986907 +0900
-+++ b/storage/innobase/buf/buf0buddy.c	2010-12-03 15:48:29.275025723 +0900
+--- a/storage/innobase/buf/buf0buddy.c
++++ b/storage/innobase/buf/buf0buddy.c
 @@ -73,10 +73,11 @@
  	if (b) UNIV_MEM_VALID(b, BUF_BUDDY_LOW << i);
  #endif /* UNIV_DEBUG_VALGRIND */
@@ -570,9 +567,8 @@
  
  			buf = bpage;
  			UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i);
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c	2010-12-03 15:22:36.314943336 +0900
-+++ b/storage/innobase/buf/buf0buf.c	2010-12-03 15:48:29.282947357 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
 @@ -263,6 +263,7 @@
  #ifdef UNIV_PFS_RWLOCK
  /* Keys to register buffer block related rwlocks and mutexes with
@@ -1965,9 +1961,8 @@
  
  	return(len);
  }
-diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
---- a/storage/innobase/buf/buf0flu.c	2010-12-03 15:22:36.318955693 +0900
-+++ b/storage/innobase/buf/buf0flu.c	2010-12-03 15:48:29.289024083 +0900
+--- a/storage/innobase/buf/buf0flu.c
++++ b/storage/innobase/buf/buf0flu.c
 @@ -307,7 +307,7 @@
  
  	ut_d(block->page.in_flush_list = TRUE);
@@ -2392,9 +2387,8 @@
  
  		ut_a(!bpage || om >= bpage->oldest_modification);
  	}
-diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
---- a/storage/innobase/buf/buf0lru.c	2010-12-03 15:22:36.321987250 +0900
-+++ b/storage/innobase/buf/buf0lru.c	2010-12-03 15:48:29.293023197 +0900
+--- a/storage/innobase/buf/buf0lru.c
++++ b/storage/innobase/buf/buf0lru.c
 @@ -143,8 +143,9 @@
  void
  buf_LRU_block_free_hashed_page(
@@ -2766,12 +2760,12 @@
 -	buf_pool_mutex_enter(buf_pool);
 +	if (UT_LIST_GET_LEN(buf_pool->unzip_LRU))
 +		have_LRU_mutex = TRUE;
-+
-+	//buf_pool_mutex_enter(buf_pool);
-+	if (have_LRU_mutex)
-+		mutex_enter(&buf_pool->LRU_list_mutex);
  
 -	freed = buf_LRU_free_from_unzip_LRU_list(buf_pool, n_iterations);
++	//buf_pool_mutex_enter(buf_pool);
++	if (have_LRU_mutex)
++		mutex_enter(&buf_pool->LRU_list_mutex);
++
 +	freed = buf_LRU_free_from_unzip_LRU_list(buf_pool, n_iterations, have_LRU_mutex);
  
  	if (!freed) {
@@ -3330,9 +3324,8 @@
  }
  
  /**********************************************************************//**
-diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
---- a/storage/innobase/buf/buf0rea.c	2010-12-03 15:22:36.323977308 +0900
-+++ b/storage/innobase/buf/buf0rea.c	2010-12-03 15:48:29.296024468 +0900
+--- a/storage/innobase/buf/buf0rea.c
++++ b/storage/innobase/buf/buf0rea.c
 @@ -311,6 +311,7 @@
  
  		return(0);
@@ -3379,9 +3372,8 @@
  
  	if ((offset == low) && (succ_offset == offset + 1)) {
  
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:48:03.048955897 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:48:29.304024564 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -264,6 +264,10 @@
  #  endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */
  	{&buf_pool_mutex_key, "buf_pool_mutex", 0},
@@ -3401,9 +3393,8 @@
  #  ifndef PFS_SKIP_BUFFER_MUTEX_RWLOCK
  	{&buf_block_lock_key, "buf_block_lock", 0},
  #  endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc	2010-12-03 15:37:45.517105700 +0900
-+++ b/storage/innobase/handler/i_s.cc	2010-12-03 15:48:29.331024462 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -1563,7 +1563,8 @@
  
  		buf_pool = buf_pool_from_array(i);
@@ -3424,9 +3415,8 @@
  
  		if (status) {
  			break;
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
---- a/storage/innobase/ibuf/ibuf0ibuf.c	2010-12-03 15:48:03.068954202 +0900
-+++ b/storage/innobase/ibuf/ibuf0ibuf.c	2010-12-03 15:48:29.335988682 +0900
+--- a/storage/innobase/ibuf/ibuf0ibuf.c
++++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -3821,9 +3821,11 @@
  		ulint		fold = buf_page_address_fold(space, page_no);
  		buf_pool_t*	buf_pool = buf_pool_get(space, page_no);
@@ -3441,9 +3431,8 @@
  
  		if (UNIV_LIKELY_NULL(bpage)) {
  			/* A buffer pool watch has been set or the
-diff -ruN a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h
---- a/storage/innobase/include/buf0buddy.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/buf0buddy.h	2010-12-03 15:48:29.338023826 +0900
+--- a/storage/innobase/include/buf0buddy.h
++++ b/storage/innobase/include/buf0buddy.h
 @@ -51,10 +51,11 @@
  	buf_pool_t*	buf_pool,
  			/*!< buffer pool in which the block resides */
@@ -3467,9 +3456,8 @@
  	__attribute__((nonnull));
  
  #ifndef UNIV_NONINL
-diff -ruN a/storage/innobase/include/buf0buddy.ic b/storage/innobase/include/buf0buddy.ic
---- a/storage/innobase/include/buf0buddy.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/buf0buddy.ic	2010-12-03 15:48:29.339040413 +0900
+--- a/storage/innobase/include/buf0buddy.ic
++++ b/storage/innobase/include/buf0buddy.ic
 @@ -46,10 +46,11 @@
  			/*!< in: buffer pool in which the page resides */
  	ulint	i,	/*!< in: index of buf_pool->zip_free[],
@@ -3544,9 +3532,8 @@
  }
  
  #ifdef UNIV_MATERIALIZE
-diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h	2010-12-03 15:22:36.327954660 +0900
-+++ b/storage/innobase/include/buf0buf.h	2010-12-03 15:48:29.343024683 +0900
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
 @@ -205,6 +205,20 @@
  /*==========================*/
  
@@ -3640,9 +3627,8 @@
  	mutex_enter(&b->mutex);		\
  } while (0)
  
-diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
---- a/storage/innobase/include/buf0buf.ic	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/buf0buf.ic	2010-12-03 15:48:29.345024524 +0900
+--- a/storage/innobase/include/buf0buf.ic
++++ b/storage/innobase/include/buf0buf.ic
 @@ -274,7 +274,7 @@
  	case BUF_BLOCK_ZIP_FREE:
  		/* This is a free page in buf_pool->zip_free[].
@@ -3887,9 +3873,8 @@
 +	}
 +}
  #endif /* !UNIV_HOTBACKUP */
-diff -ruN a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
---- a/storage/innobase/include/buf0lru.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/buf0lru.h	2010-12-03 15:48:29.349024701 +0900
+--- a/storage/innobase/include/buf0lru.h
++++ b/storage/innobase/include/buf0lru.h
 @@ -111,8 +111,9 @@
  buf_LRU_free_block(
  /*===============*/
@@ -3911,9 +3896,8 @@
  /******************************************************************//**
  Adds a block to the LRU list. */
  UNIV_INTERN
-diff -ruN a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
---- a/storage/innobase/include/sync0rw.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/sync0rw.h	2010-12-03 15:48:29.349942993 +0900
+--- a/storage/innobase/include/sync0rw.h
++++ b/storage/innobase/include/sync0rw.h
 @@ -112,6 +112,7 @@
  extern	mysql_pfs_key_t	archive_lock_key;
  # endif /* UNIV_LOG_ARCHIVE */
@@ -3922,9 +3906,8 @@
  extern	mysql_pfs_key_t	buf_block_lock_key;
  # ifdef UNIV_SYNC_DEBUG
  extern	mysql_pfs_key_t	buf_block_debug_latch_key;
-diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
---- a/storage/innobase/include/sync0sync.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/sync0sync.h	2010-12-03 15:48:29.352024614 +0900
+--- a/storage/innobase/include/sync0sync.h
++++ b/storage/innobase/include/sync0sync.h
 @@ -75,6 +75,10 @@
  extern mysql_pfs_key_t	buffer_block_mutex_key;
  extern mysql_pfs_key_t	buf_pool_mutex_key;
@@ -3969,9 +3952,8 @@
  				may be) threads waiting in the global wait
  				array for this mutex to be released.
  				Otherwise, this is 0. */
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 15:48:03.080956216 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 15:48:29.355023766 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -3098,7 +3098,7 @@
  								level += log_sys->max_checkpoint_age
  									 - (lsn - oldest_modification);
@@ -3990,9 +3972,8 @@
  						new_blocks_num++;
  					}
  					if (!found) {
-diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
---- a/storage/innobase/sync/sync0sync.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/sync/sync0sync.c	2010-12-03 15:48:29.358023890 +0900
+--- a/storage/innobase/sync/sync0sync.c
++++ b/storage/innobase/sync/sync0sync.c
 @@ -285,7 +285,7 @@
  	mutex->lock_word = 0;
  #endif
 
=== modified file 'patches/innodb_stats.patch'
--- patches/innodb_stats.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_stats.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c
---- a/storage/innobase/dict/dict0boot.c	2010-12-03 15:48:03.034036843 +0900
-+++ b/storage/innobase/dict/dict0boot.c	2010-12-03 17:19:24.835112632 +0900
+--- a/storage/innobase/dict/dict0boot.c
++++ b/storage/innobase/dict/dict0boot.c
 @@ -266,6 +266,29 @@
  	/* Get the dictionary header */
  	dict_hdr = dict_hdr_get(&mtr);
@@ -101,9 +100,8 @@
  
  	mutex_exit(&(dict_sys->mutex));
  }
-diff -ruN a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c
---- a/storage/innobase/dict/dict0crea.c	2010-12-03 15:48:03.036081059 +0900
-+++ b/storage/innobase/dict/dict0crea.c	2010-12-03 17:19:24.836964976 +0900
+--- a/storage/innobase/dict/dict0crea.c
++++ b/storage/innobase/dict/dict0crea.c
 @@ -508,6 +508,56 @@
  }
  
@@ -280,16 +278,10 @@
  	}
  
  	if (node->state == INDEX_CREATE_INDEX_TREE) {
-@@ -1178,6 +1317,66 @@
- 		return(NULL);
- 	}
+@@ -1184,6 +1323,66 @@
+ }
  
-+	thr->run_node = que_node_get_parent(node);
-+
-+	return(thr);
-+}
-+
-+/****************************************************************//**
+ /****************************************************************//**
 +*/
 +UNIV_INTERN
 +que_thr_t*
@@ -344,12 +336,17 @@
 +		return(NULL);
 +	}
 +
- 	thr->run_node = que_node_get_parent(node);
- 
- 	return(thr);
-diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
---- a/storage/innobase/dict/dict0dict.c	2010-12-03 15:48:03.040222428 +0900
-+++ b/storage/innobase/dict/dict0dict.c	2010-12-03 17:19:24.841947690 +0900
++	thr->run_node = que_node_get_parent(node);
++
++	return(thr);
++}
++
++/****************************************************************//**
+ Creates the foreign key constraints system tables inside InnoDB
+ at database creation or database start if they are not found or are
+ not of the right form.
+--- a/storage/innobase/dict/dict0dict.c
++++ b/storage/innobase/dict/dict0dict.c
 @@ -755,7 +755,7 @@
  		print an error message and return without doing
  		anything. */
@@ -797,9 +794,8 @@
  
  	dict_table_stats_lock(table, RW_S_LATCH);
  
-diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c
---- a/storage/innobase/dict/dict0load.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/dict/dict0load.c	2010-12-03 17:19:24.845947460 +0900
+--- a/storage/innobase/dict/dict0load.c
++++ b/storage/innobase/dict/dict0load.c
 @@ -50,7 +50,8 @@
  	"SYS_COLUMNS",
  	"SYS_FIELDS",
@@ -901,9 +897,8 @@
  Determine the flags of a table described in SYS_TABLES.
  @return compressed page size in kilobytes; or 0 if the tablespace is
  uncompressed, ULINT_UNDEFINED on error */
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:17:03.665960357 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 17:22:21.586939783 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -187,6 +187,7 @@
  static my_bool	innobase_rollback_on_timeout		= FALSE;
  static my_bool	innobase_create_status_file		= FALSE;
@@ -1073,9 +1068,8 @@
  mysql_declare_plugin_end;
  
  /** @brief Initialize the default value of innodb_commit_concurrency.
-diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
---- a/storage/innobase/handler/i_s.cc	2010-12-03 17:17:03.666956117 +0900
-+++ b/storage/innobase/handler/i_s.cc	2010-12-03 17:19:24.880964526 +0900
+--- a/storage/innobase/handler/i_s.cc
++++ b/storage/innobase/handler/i_s.cc
 @@ -49,6 +49,7 @@
  #include "trx0trx.h" /* for TRX_QUE_STATE_STR_MAX_LEN */
  #include "trx0rseg.h" /* for trx_rseg_struct */
@@ -1654,9 +1648,8 @@
 +	STRUCT_FLD(system_vars, NULL),
 +	STRUCT_FLD(__reserved1, NULL)
 +};
-diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
---- a/storage/innobase/handler/i_s.h	2010-12-03 17:17:03.668953884 +0900
-+++ b/storage/innobase/handler/i_s.h	2010-12-03 17:19:24.882947826 +0900
+--- a/storage/innobase/handler/i_s.h
++++ b/storage/innobase/handler/i_s.h
 @@ -43,5 +43,8 @@
  extern struct st_mysql_plugin   i_s_innodb_sys_foreign;
  extern struct st_mysql_plugin   i_s_innodb_sys_foreign_cols;
@@ -1666,9 +1659,8 @@
 +extern struct st_mysql_plugin	i_s_innodb_index_stats;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h
---- a/storage/innobase/include/dict0boot.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/dict0boot.h	2010-12-03 17:19:24.885947372 +0900
+--- a/storage/innobase/include/dict0boot.h
++++ b/storage/innobase/include/dict0boot.h
 @@ -104,6 +104,7 @@
  #define DICT_COLUMNS_ID		2
  #define DICT_INDEXES_ID		3
@@ -1708,9 +1700,8 @@
  #ifndef UNIV_NONINL
  #include "dict0boot.ic"
  #endif
-diff -ruN a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h
---- a/storage/innobase/include/dict0crea.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/dict0crea.h	2010-12-03 17:19:24.886949643 +0900
+--- a/storage/innobase/include/dict0crea.h
++++ b/storage/innobase/include/dict0crea.h
 @@ -53,6 +53,14 @@
  	dict_index_t*	index,	/*!< in: index to create, built as a memory data
  				structure */
@@ -1764,9 +1755,8 @@
  
  #ifndef UNIV_NONINL
  #include "dict0crea.ic"
-diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
---- a/storage/innobase/include/dict0dict.h	2010-12-03 15:48:03.073024387 +0900
-+++ b/storage/innobase/include/dict0dict.h	2010-12-03 17:19:24.888965622 +0900
+--- a/storage/innobase/include/dict0dict.h
++++ b/storage/innobase/include/dict0dict.h
 @@ -1096,10 +1096,18 @@
  dict_update_statistics(
  /*===================*/
@@ -1795,9 +1785,8 @@
  };
  #endif /* !UNIV_HOTBACKUP */
  
-diff -ruN a/storage/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h
---- a/storage/innobase/include/dict0load.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/dict0load.h	2010-12-03 17:19:24.889947481 +0900
+--- a/storage/innobase/include/dict0load.h
++++ b/storage/innobase/include/dict0load.h
 @@ -41,6 +41,7 @@
  	SYS_FIELDS,
  	SYS_FOREIGN,
@@ -1827,9 +1816,8 @@
  #ifndef UNIV_NONINL
  #include "dict0load.ic"
  #endif
-diff -ruN a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h
---- a/storage/innobase/include/que0que.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/que0que.h	2010-12-03 17:19:24.892947946 +0900
+--- a/storage/innobase/include/que0que.h
++++ b/storage/innobase/include/que0que.h
 @@ -492,6 +492,8 @@
  #define QUE_NODE_CALL		31
  #define QUE_NODE_EXIT		32
@@ -1839,9 +1827,8 @@
  /* Query thread states */
  #define QUE_THR_RUNNING		1
  #define QUE_THR_PROCEDURE_WAIT	2
-diff -ruN a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
---- a/storage/innobase/include/row0mysql.h	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/include/row0mysql.h	2010-12-03 17:19:24.904973020 +0900
+--- a/storage/innobase/include/row0mysql.h
++++ b/storage/innobase/include/row0mysql.h
 @@ -387,6 +387,22 @@
  					then checked for not being too
  					large. */
@@ -1865,9 +1852,8 @@
  Scans a table create SQL string and adds to the data dictionary
  the foreign key constraints declared in the string. This function
  should be called after the indexes for a table have been created.
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-03 15:53:54.622036720 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-03 17:19:24.906953188 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -211,6 +211,9 @@
  extern ibool	srv_innodb_status;
  
@@ -1878,9 +1864,8 @@
  
  extern ibool	srv_use_doublewrite_buf;
  extern ibool	srv_use_checksums;
-diff -ruN a/storage/innobase/que/que0que.c b/storage/innobase/que/que0que.c
---- a/storage/innobase/que/que0que.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/que/que0que.c	2010-12-03 17:19:24.910953422 +0900
+--- a/storage/innobase/que/que0que.c
++++ b/storage/innobase/que/que0que.c
 @@ -621,11 +621,21 @@
  
  		que_graph_free_recursive(cre_ind->ind_def);
@@ -1921,9 +1906,8 @@
  	} else if (type == QUE_NODE_ROW_PRINTF) {
  		thr = row_printf_step(thr);
  	} else {
-diff -ruN a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c
---- a/storage/innobase/row/row0ins.c	2011-03-10 00:11:38.000000000 +0900
-+++ b/storage/innobase/row/row0ins.c	2011-03-30 11:44:58.000000000 +0900
+--- a/storage/innobase/row/row0ins.c
++++ b/storage/innobase/row/row0ins.c
 @@ -2012,6 +2012,8 @@
  	}
  
@@ -1933,9 +1917,8 @@
  	{
  		page_t*	page = btr_cur_get_page(&cursor);
  		rec_t*	first_rec = page_rec_get_next(
-diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c
---- a/storage/innobase/row/row0merge.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/row/row0merge.c	2010-12-03 17:19:24.914955391 +0900
+--- a/storage/innobase/row/row0merge.c
++++ b/storage/innobase/row/row0merge.c
 @@ -2019,6 +2019,8 @@
  		"UPDATE SYS_INDEXES SET NAME=CONCAT('"
  		TEMP_INDEX_PREFIX_STR "', NAME) WHERE ID = :indexid;\n"
@@ -1945,9 +1928,8 @@
  		/* Drop the field definitions of the index. */
  		"DELETE FROM SYS_FIELDS WHERE INDEX_ID = :indexid;\n"
  		/* Drop the index definition and the B-tree. */
-diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
---- a/storage/innobase/row/row0mysql.c	2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/row/row0mysql.c	2010-12-03 17:19:24.918953476 +0900
+--- a/storage/innobase/row/row0mysql.c
++++ b/storage/innobase/row/row0mysql.c
 @@ -921,6 +921,9 @@
  
  	table->stat_modified_counter = counter + 1;
@@ -2057,9 +2039,8 @@
  			   "               DELETE FROM SYS_FIELDS\n"
  			   "               WHERE INDEX_ID = index_id;\n"
  			   "               DELETE FROM SYS_INDEXES\n"
-diff -ruN a/storage/innobase/row/row0row.c b/storage/innobase/row/row0row.c
---- a/storage/innobase/row/row0row.c	2011-03-10 00:11:38.000000000 +0900
-+++ b/storage/innobase/row/row0row.c	2011-03-30 11:44:58.000000000 +0900
+--- a/storage/innobase/row/row0row.c
++++ b/storage/innobase/row/row0row.c
 @@ -347,6 +347,14 @@
  
  	rec_len = rec_offs_n_fields(offsets);
@@ -2090,9 +2071,8 @@
  		field = rec_get_nth_field(rec, offsets, i, &len);
  
  		dfield_set_data(dfield, field, len);
-diff -ruN a/storage/innobase/row/row0upd.c b/storage/innobase/row/row0upd.c
---- a/storage/innobase/row/row0upd.c	2011-03-10 00:11:38.000000000 +0900
-+++ b/storage/innobase/row/row0upd.c	2011-03-30 11:44:58.000000000 +0900
+--- a/storage/innobase/row/row0upd.c
++++ b/storage/innobase/row/row0upd.c
 @@ -439,6 +439,12 @@
  				0);
  		}
@@ -2125,9 +2105,8 @@
  		data = rec_get_nth_field(rec, offsets, i, &len);
  
  		dfield = dtuple_get_nth_field(entry, i);
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 15:53:54.625288512 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 17:19:24.922953561 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -398,6 +398,9 @@
  /* When estimating number of different key values in an index, sample
  this many index pages */
@@ -2138,9 +2117,8 @@
  
  UNIV_INTERN ibool	srv_use_doublewrite_buf	= TRUE;
  UNIV_INTERN ibool	srv_use_checksums = TRUE;
-diff -ruN a/storage/innobase/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c
---- a/storage/innobase/trx/trx0rec.c	2011-03-10 00:11:38.000000000 +0900
-+++ b/storage/innobase/trx/trx0rec.c	2011-03-30 11:44:58.000000000 +0900
+--- a/storage/innobase/trx/trx0rec.c
++++ b/storage/innobase/trx/trx0rec.c
 @@ -665,14 +665,27 @@
  	/* Save to the undo log the old values of the columns to be updated. */
  
 
=== modified file 'patches/innodb_thread_concurrency_timer_based.patch'
--- patches/innodb_thread_concurrency_timer_based.patch	2011-07-22 16:56:42 +0000
+++ patches/innodb_thread_concurrency_timer_based.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:41:52.045404706 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-03 15:42:11.568959457 +0900
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
 @@ -148,6 +148,7 @@
  static ulong innobase_write_io_threads;
  static long innobase_buffer_pool_instances = 1;
@@ -47,9 +46,8 @@
    MYSQL_SYSVAR(thread_sleep_delay),
    MYSQL_SYSVAR(autoinc_lock_mode),
    MYSQL_SYSVAR(show_verbose_locks),
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h	2010-12-03 15:37:45.543027751 +0900
-+++ b/storage/innobase/include/srv0srv.h	2010-12-03 15:42:11.571024631 +0900
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
 @@ -161,6 +161,8 @@
  extern ulint	srv_mem_pool_size;
  extern ulint	srv_lock_table_size;
@@ -59,9 +57,8 @@
  extern ulint	srv_n_file_io_threads;
  extern ulong	srv_read_ahead_threshold;
  extern ulint	srv_n_read_io_threads;
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c	2010-12-03 15:37:45.546023493 +0900
-+++ b/storage/innobase/srv/srv0srv.c	2010-12-03 15:42:11.574955879 +0900
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
 @@ -347,6 +347,7 @@
  computer. Bigger computers need bigger values. Value 0 will disable the
  concurrency check. */
 
=== modified file 'patches/log_connection_error.patch'
--- patches/log_connection_error.patch	2011-07-22 16:56:42 +0000
+++ patches/log_connection_error.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN /dev/null b/patch_info/log_connection_error.patch
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/patch_info/log_connection_error.patch	2011-04-09 18:48:54.000000000 +0400
+--- /dev/null
++++ b/patch_info/log_connection_error.patch
 @@ -0,0 +1,6 @@
 +File=log_connection_error.patch
 +Name=logging abandoned connections
@@ -15,9 +14,8 @@
 +Author=Percona <[e-mail]>
 +License=GPL
 +Comment=
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2011-04-09 18:48:53.000000000 +0400
-+++ b/sql/mysqld.cc	2011-04-09 18:48:54.000000000 +0400
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
 @@ -5040,6 +5040,10 @@
  
      DBUG_PRINT("error",("Too many connections"));
 
=== modified file 'patches/log_warnings_suppress.patch'
--- patches/log_warnings_suppress.patch	2011-07-22 16:56:42 +0000
+++ patches/log_warnings_suppress.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN /dev/null b/patch_info/log_warnings_suppress.patch
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/patch_info/log_warnings_suppress.patch	2011-04-09 18:48:59.000000000 +0400
+--- /dev/null
++++ b/patch_info/log_warnings_suppress.patch
 @@ -0,0 +1,9 @@
 +File=log_warnings_suppress.patch
 +Name=Disable log warnings for enumerated warnings (old name:suppress_log_warning_1592.patch)
@@ -18,9 +17,8 @@
 +Changelog
 [phone] rename patch suppress_log_warning_1592.patch to log_warnings_silence.patch. Also remove boolean system variable "suppress_log_warning_1592" and add set varbile "log_warnings_silence" (possible values: 1592)
 [phone] rename patch log_warning_silence.patch to log_warnings_suppress.patch. Also rename variable "log_warning_silence" to "log_warning_suppress".
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2011-04-09 18:48:59.000000000 +0400
-+++ b/sql/mysqld.cc	2011-04-09 18:48:59.000000000 +0400
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
 @@ -623,6 +623,8 @@
  SHOW_COMP_OPTION have_crypt, have_compress;
  SHOW_COMP_OPTION have_profiling;
@@ -30,9 +28,8 @@
  /* Thread specific variables */
  
  pthread_key(MEM_ROOT**,THR_MALLOC);
-diff -ruN a/sql/mysqld.h b/sql/mysqld.h
---- a/sql/mysqld.h	2011-04-09 18:48:58.000000000 +0400
-+++ b/sql/mysqld.h	2011-04-09 18:48:59.000000000 +0400
+--- a/sql/mysqld.h
++++ b/sql/mysqld.h
 @@ -228,6 +228,8 @@
  extern TYPELIB thread_handling_typelib;
  extern my_decimal decimal_zero;
@@ -42,10 +39,9 @@
  extern pthread_key(MEM_ROOT**,THR_MALLOC);
  
  #ifdef HAVE_PSI_INTERFACE
-diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
---- a/sql/sql_class.cc	2011-04-09 18:48:50.000000000 +0400
-+++ b/sql/sql_class.cc	2011-04-09 18:48:59.000000000 +0400
-@@ -4575,7 +4575,7 @@
+--- a/sql/sql_class.cc
++++ b/sql/sql_class.cc
+@@ -4578,7 +4578,7 @@
                            ER_BINLOG_UNSAFE_STATEMENT,
                            ER(ER_BINLOG_UNSAFE_STATEMENT),
                            ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type]));
@@ -54,9 +50,8 @@
        {
          char buf[MYSQL_ERRMSG_SIZE * 2];
          sprintf(buf, ER(ER_BINLOG_UNSAFE_STATEMENT),
-diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h	2011-04-09 18:48:53.000000000 +0400
-+++ b/sql/sql_class.h	2011-04-09 18:48:59.000000000 +0400
+--- a/sql/sql_class.h
++++ b/sql/sql_class.h
 @@ -90,6 +90,7 @@
    SLOG_F_TMP_TABLE, SLOG_F_TMP_DISK, SLOG_F_FILESORT,
    SLOG_F_FILESORT_DISK
@@ -65,9 +60,8 @@
  enum enum_slave_exec_mode { SLAVE_EXEC_MODE_STRICT,
                              SLAVE_EXEC_MODE_IDEMPOTENT,
                              SLAVE_EXEC_MODE_LAST_BIT};
-diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc
---- a/sql/sys_vars.cc	2011-04-09 18:48:55.000000000 +0400
-+++ b/sql/sys_vars.cc	2011-04-09 18:48:59.000000000 +0400
+--- a/sql/sys_vars.cc
++++ b/sql/sys_vars.cc
 @@ -1470,6 +1470,15 @@
         READ_ONLY GLOBAL_VAR(mysqld_port), CMD_LINE(REQUIRED_ARG, 'P'),
         VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1));
 
=== modified file 'patches/microsec_process.patch'
--- patches/microsec_process.patch	2011-07-22 16:56:42 +0000
+++ patches/microsec_process.patch	2011-07-27 11:32:35 +0000
@@ -5,9 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN /dev/null b/patch_info/microsec_process.info
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ b/patch_info/microsec_process.info	2010-12-02 20:41:41.616069579 +0900
+--- /dev/null
++++ b/patch_info/microsec_process.info
 @@ -0,0 +1,8 @@
 +File=microsec_process.patch
 +Name=Adds INFOMATION_SCHEMA.PROCESSLIST with TIME_MS column
@@ -17,9 +16,8 @@
 +Comment=
 +2010-01
 +Ported to 5.1.42
-diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc	2010-12-02 19:22:40.054024541 +0900
-+++ b/sql/sql_show.cc	2010-12-02 20:41:41.622941425 +0900
+--- a/sql/sql_show.cc
++++ b/sql/sql_show.cc
 @@ -1890,7 +1890,8 @@
    TABLE *table= tables->table;
    CHARSET_INFO *cs= system_charset_info;
 
=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff	2011-07-22 16:56:42 +0000
+++ patches/mysql-test.diff	2011-07-27 11:32:35 +0000
@@ -1,6 +1,5 @@
-diff -ruN a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
---- a/mysql-test/include/default_mysqld.cnf	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/include/default_mysqld.cnf	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/include/default_mysqld.cnf
++++ b/mysql-test/include/default_mysqld.cnf
 @@ -29,7 +29,7 @@
  max_heap_table_size=        1M
  
@@ -10,9 +9,8 @@
  loose-innodb_write_io_threads=    2
  loose-innodb_read_io_threads=     2
  loose-innodb_log_buffer_size=     1M
-diff -ruN a/mysql-test/r/connect.result b/mysql-test/r/connect.result
---- a/mysql-test/r/connect.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/connect.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/connect.result
++++ b/mysql-test/r/connect.result
 @@ -1,3 +1,4 @@
 +set global log_warnings=0;
  drop table if exists t1,t2;
@@ -23,9 +21,8 @@
  # -- End of 5.1 tests
  # ------------------------------------------------------------------
 +set global log_warnings=1;
-diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result
---- a/mysql-test/r/create.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/create.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/create.result
++++ b/mysql-test/r/create.result
 @@ -1741,7 +1741,11 @@
    `COMMAND` varchar(16) NOT NULL DEFAULT '',
    `TIME` int(7) NOT NULL DEFAULT '0',
@@ -52,9 +49,8 @@
  ) ENGINE=MyISAM DEFAULT CHARSET=utf8
  drop table t1;
  create table t1 like information_schema.character_sets;
-diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
---- a/mysql-test/r/information_schema.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/information_schema.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/information_schema.result
++++ b/mysql-test/r/information_schema.result
 @@ -46,14 +46,17 @@
  select * from v1;
  c
@@ -266,9 +262,8 @@
  VIEWS	information_schema.VIEWS	1
  create table t1(f1 int);
  create view v1 as select f1+1 as a from t1;
-diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
---- a/mysql-test/r/information_schema_db.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/information_schema_db.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/information_schema_db.result
++++ b/mysql-test/r/information_schema_db.result
 @@ -6,14 +6,17 @@
  show tables where Tables_in_information_schema NOT LIKE 'Innodb%';
  Tables_in_information_schema
@@ -319,9 +314,8 @@
  TRIGGERS
  create database `inf%`;
  create database mbase;
-diff -ruN a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
---- a/mysql-test/r/mysqld--help-notwin.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/mysqld--help-notwin.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/mysqld--help-notwin.result
++++ b/mysql-test/r/mysqld--help-notwin.result
 @@ -250,21 +250,40 @@
   --log-slow-admin-statements 
   Log slow OPTIMIZE, ANALYZE, ALTER and other
@@ -493,9 +487,8 @@
  
  To see what values a running MySQL server is using, type
  'mysqladmin variables' instead of 'mysqld --verbose --help'.
-diff -ruN a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
---- a/mysql-test/r/mysqldump.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/mysqldump.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/mysqldump.result
++++ b/mysql-test/r/mysqldump.result
 @@ -1832,7 +1832,7 @@
  # Bug#21288 mysqldump segmentation fault when using --where
  #
@@ -505,9 +498,8 @@
  mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server
  
  /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
---- a/mysql-test/r/mysqlshow.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/mysqlshow.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/mysqlshow.result
++++ b/mysql-test/r/mysqlshow.result
 @@ -80,14 +80,17 @@
  |                Tables                 |
  +---------------------------------------+
@@ -639,9 +631,8 @@
  +---------------------------------------+
  Wildcard: inf_rmation_schema
  +--------------------+
-diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result
---- a/mysql-test/r/select.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/select.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/select.result
++++ b/mysql-test/r/select.result
 @@ -2196,10 +2196,10 @@
  select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
  a	a
@@ -655,9 +646,8 @@
  3	3
  select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
  a	a
-diff -ruN a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
---- a/mysql-test/r/show_check.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/show_check.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/show_check.result
++++ b/mysql-test/r/show_check.result
 @@ -1538,14 +1538,14 @@
  SET NAMES latin1;
  SELECT GET_LOCK('t',1000) AS 'óóóó';;
@@ -679,9 +669,8 @@
  SELECT RELEASE_LOCK('t');
  RELEASE_LOCK('t')
  1
-diff -ruN a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result
---- a/mysql-test/r/sp-threads.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/r/sp-threads.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/r/sp-threads.result
++++ b/mysql-test/r/sp-threads.result
 @@ -33,11 +33,11 @@
  lock tables t2 write;
  call bug9486();
@@ -699,9 +688,8 @@
  unlock tables;
  drop procedure bug9486;
  drop table t1, t2;
-diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
---- a/mysql-test/suite/innodb/r/innodb.result	2011-04-09 18:49:04.000000000 +0400
-+++ b/mysql-test/suite/innodb/r/innodb.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/suite/innodb/r/innodb.result
++++ b/mysql-test/suite/innodb/r/innodb.result
 @@ -1664,7 +1664,7 @@
  drop table t1;
  SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
@@ -711,9 +699,8 @@
  SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
  variable_value
  16384
-diff -ruN a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
---- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
++++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
 @@ -10,7 +10,6 @@
  1
  '#---------------------FN_DYNVARS_046_02-------------------------#'
@@ -722,9 +709,8 @@
  SELECT @@innodb_flush_log_at_trx_commit;
  @@innodb_flush_log_at_trx_commit
  1
-diff -ruN a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
---- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
++++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
 @@ -56,7 +56,7 @@
  # Check if variable can be accessed with and without @@ sign                  #
  ###############################################################################
@@ -734,9 +720,8 @@
  SET innodb_flush_log_at_trx_commit = 1;
  SELECT @@innodb_flush_log_at_trx_commit;
  
-diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test
---- a/mysql-test/t/connect.test	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/t/connect.test	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/t/connect.test
++++ b/mysql-test/t/connect.test
 @@ -1,3 +1,5 @@
 +set global log_warnings=0;
 +
@@ -748,9 +733,8 @@
  --source include/wait_until_count_sessions.inc
  
 +set global log_warnings=1;
-diff -ruN a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
---- a/mysql-test/t/show_check.test	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/t/show_check.test	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/t/show_check.test
++++ b/mysql-test/t/show_check.test
 @@ -1376,10 +1376,10 @@
  let $wait_timeout= 10;
  let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
@@ -764,9 +748,8 @@
  SHOW PROCESSLIST;
  SELECT RELEASE_LOCK('t');
  --connection con1
-diff -ruN a/mysql-test/t/sp-threads.test b/mysql-test/t/sp-threads.test
---- a/mysql-test/t/sp-threads.test	2011-04-09 18:48:03.000000000 +0400
-+++ b/mysql-test/t/sp-threads.test	2011-04-09 18:49:05.000000000 +0400
+--- a/mysql-test/t/sp-threads.test
++++ b/mysql-test/t/sp-threads.test
 @@ -81,7 +81,7 @@
  connection con2root;
  --sleep 2
@@ -776,509 +759,426 @@
  show processlist;
  unlock tables;
  connection con1root;
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.log_slow_sp_statements;
 +@@global.log_slow_sp_statements
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test
 @@ -0,0 +1 @@
 +SELECT @@global.log_slow_sp_statements;
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.fast_index_creation;
 +@@global.fast_index_creation
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.have_response_time_distribution;
 +@@global.have_response_time_distribution
 +YES
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_adaptive_flushing_method;
 +@@global.innodb_adaptive_flushing_method
 +estimate
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_adaptive_hash_index_partitions;
 +@@global.innodb_adaptive_hash_index_partitions
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_buffer_pool_restore_at_startup;
 +@@global.innodb_buffer_pool_restore_at_startup
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_buffer_pool_shm_checksum;
 +@@global.innodb_buffer_pool_shm_checksum
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_buffer_pool_shm_key;
 +@@global.innodb_buffer_pool_shm_key
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_checkpoint_age_target;
 +@@global.innodb_checkpoint_age_target
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_corrupt_table_action;
 +@@global.innodb_corrupt_table_action
 +assert
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_dict_size_limit;
 +@@global.innodb_dict_size_limit
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_doublewrite_file;
 +@@global.innodb_doublewrite_file
 +NULL
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_fast_checksum;
 +@@global.innodb_fast_checksum
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_flush_neighbor_pages;
 +@@global.innodb_flush_neighbor_pages
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_ibuf_accel_rate;
 +@@global.innodb_ibuf_accel_rate
 +100
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_ibuf_active_contract;
 +@@global.innodb_ibuf_active_contract
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_ibuf_max_size;
 +@@global.innodb_ibuf_max_size
 [phone]
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_import_table_from_xtrabackup;
 +@@global.innodb_import_table_from_xtrabackup
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_lazy_drop_table;
 +@@global.innodb_lazy_drop_table
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_log_block_size;
 +@@global.innodb_log_block_size
 +512
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_page_size;
 +@@global.innodb_page_size
 +16384
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_read_ahead;
 +@@global.innodb_read_ahead
 +linear
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_recovery_stats;
 +@@global.innodb_recovery_stats
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_recovery_update_relay_log;
 +@@global.innodb_recovery_update_relay_log
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_show_locks_held;
 +@@global.innodb_show_locks_held
 +10
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_show_verbose_locks;
 +@@global.innodb_show_verbose_locks
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_stats_auto_update;
 +@@global.innodb_stats_auto_update
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_stats_update_need_lock;
 +@@global.innodb_stats_update_need_lock
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_thread_concurrency_timer_based;
 +@@global.innodb_thread_concurrency_timer_based
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_use_global_flush_log_at_trx_commit;
 +@@global.innodb_use_global_flush_log_at_trx_commit
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.innodb_use_sys_stats_table;
 +@@global.innodb_use_sys_stats_table
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.log_slow_filter;
 +@@global.log_slow_filter
 +
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.log_slow_rate_limit;
 +@@global.log_slow_rate_limit
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.log_slow_slave_statements;
 +@@global.log_slow_slave_statements
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.log_slow_verbosity;
 +@@global.log_slow_verbosity
 +
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.log_warnings_suppress;
 +@@global.log_warnings_suppress
 +
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.optimizer_fix;
 +@@global.optimizer_fix
 +1
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.query_cache_strip_comments;
 +@@global.query_cache_strip_comments
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.query_response_time_range_base;
 +@@global.query_response_time_range_base
 +10
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.query_response_time_stats;
 +@@global.query_response_time_stats
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.slow_query_log_timestamp_always;
 +@@global.slow_query_log_timestamp_always
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.slow_query_log_timestamp_precision;
 +@@global.slow_query_log_timestamp_precision
 +second
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.slow_query_log_use_global_control;
 +@@global.slow_query_log_use_global_control
 +
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.thread_statistics;
 +@@global.thread_statistics
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/userstat_basic.result
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/r/userstat_basic.result	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/r/userstat_basic.result
 @@ -0,0 +1,3 @@
 +SELECT @@global.userstat;
 +@@global.userstat
 +0
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test	2011-04-09 18:49:05.000000000 +0400
+--- /dev/null
++++ b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test
 @@ -0,0 +1 @@
 +SELECT @@global.fast_index_creation;
-diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/have_response_time_distribution_basic.test
---- /dev/null	1970-01-01 00:00:00.000000000 +0000