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

[Oleg Tsarev]

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

1. patches/bug813587.patch: fix offsets
2. patches/innodb_bug60788.patch: fix offsets
3. patches/innodb_extend_slow.patch: fix offsets
4. patches/innodb_fix_misc.patch: fix offsets
5. patches/innodb_lru_dump_restore.patch: updated on 'quilt refresh'
6. patches/innodb_recovery_patches.patch: fix offsets
7. patches/innodb_show_sys_tables.patch: updated on 'quilt refresh'
8. patches/innodb_stats.patch: updated on 'quilt refresh'
9. patches/percona-support.patch: updated on 'quilt refresh'
10. patches/response-time-distribution.patch: fix offsets
11. update all patches: remove timestamp from header
12. 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 248
make clean && make all && mv Percona-Server-5.1.57-rel12.8 a
bzr update -r 249
make clean && make all && mv Percona-Server-5.1.57-rel12.8 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 most of this with the merge of the quilt branch, so will do a refresh and push it, but not actually merge this branch itself.

Unmerged revisions

249. By Oleg Tsarev on 2011-07-27

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

248. 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)

247. By Stewart Smith on 2011-07-25

add back in applying of handlersocket patch, was accidently removed

246. By Stewart Smith on 2011-07-22

make it optional if we use quilt to apply patches. this means you only need quilt installed for a dev environment

245. By Stewart Smith on 2011-07-22

merge trunk

244. By Stewart Smith on 2011-07-07

merge Oleg's patch fixes

243. By Stewart Smith on 2011-06-23

move to using quilt for patch management. We also have a quiltrc file that is needed in ~/.quiltrc for those editing patches. This moves all patches into patches/ and this is symlinked into generated Percona Server tree.

242. By Stewart Smith on 2011-06-23

merge bug794776 fix: write_to_slow_log used without initialization

241. By Stewart Smith on 2011-06-23

merge fix of Percona-Server directories, including very useful symlinks to simplify jenkins build

240. By Stewart Smith on 2011-06-23

merge fix for precona_innodb_deadlock failures

=== modified file 'patches/bug580324.patch'
--- patches/bug580324.patch	2011-06-23 02:18:22 +0000
+++ patches/bug580324.patch	2011-07-27 11:11:52 +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	2010-05-27 19:54:18.000000000 +0400
-+++ b/sql/sql_base.cc	2010-05-27 19:55:20.000000000 +0400
+--- a/sql/sql_base.cc
++++ b/sql/sql_base.cc
 @@ -233,8 +233,12 @@
  uint create_table_def_key(THD *thd, char *key, 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	2010-05-27 19:54:18.000000000 +0400
-+++ b/sql/sql_parse.cc	2010-05-27 20:03:20.000000000 +0400
+--- a/sql/sql_parse.cc
++++ b/sql/sql_parse.cc
 @@ -1341,10 +1341,12 @@
      break;
  #else
@@ -89,9 +87,8 @@
      thd->set_query(fields, query_length);
      general_log_print(thd, command, "%s %s", table_list.table_name, fields);
      if (lower_case_table_names)
-diff -ruN a/strings/ctype-utf8.c b/strings/ctype-utf8.c
---- a/strings/ctype-utf8.c	2010-05-06 19:28:05.000000000 +0400
-+++ b/strings/ctype-utf8.c	2010-05-27 20:04:20.000000000 +0400
+--- a/strings/ctype-utf8.c
++++ b/strings/ctype-utf8.c
 @@ -4116,6 +4116,10 @@
  {
    int code;

=== modified file 'patches/bug677407.patch'
--- patches/bug677407.patch	2011-06-23 02:18:22 +0000
+++ patches/bug677407.patch	2011-07-27 11:11:52 +0000
@@ -49,9 +49,8 @@
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-diff -ruN a/storage/innodb_plugin/trx/trx0i_s.c b/storage/innodb_plugin/trx/trx0i_s.c
---- a/storage/innodb_plugin/trx/trx0i_s.c	2010-11-03 16:39:54.000000000 +0300
-+++ b/storage/innodb_plugin/trx/trx0i_s.c	2010-11-30 13:57:03.000000000 +0300
+--- a/storage/innodb_plugin/trx/trx0i_s.c
++++ b/storage/innodb_plugin/trx/trx0i_s.c
 @@ -157,10 +157,6 @@
  	ullint		last_read;	/*!< last time the cache was read;
  					measured in microseconds since

=== modified file 'patches/bug813587.patch'
--- patches/bug813587.patch	2011-07-22 05:41:42 +0000
+++ patches/bug813587.patch	2011-07-27 11:11:52 +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-04-12 16:11:47.000000000 +0400
-+++ Percona-Server/storage/federated/ha_federated.cc	2011-07-21 13:13:25.000000000 +0400
-@@ -1641,6 +1641,7 @@ int ha_federated::open(const char *name,
+--- a/storage/federated/ha_federated.cc
++++ b/storage/federated/ha_federated.cc
+@@ -1641,6 +1641,7 @@
  
  int ha_federated::close(void)
  {
@@ -17,7 +16,7 @@
    DBUG_ENTER("ha_federated::close");
  
    free_result();
-@@ -1651,6 +1652,10 @@ int ha_federated::close(void)
+@@ -1651,6 +1652,10 @@
    mysql_close(mysql);
    mysql= NULL;
  

=== modified file 'patches/bugfix48929.patch'
--- patches/bugfix48929.patch	2011-07-22 05:41:42 +0000
+++ patches/bugfix48929.patch	2011-07-27 11:11:52 +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/configure.in b/configure.in
---- a/configure.in	2010-07-07 03:33:05.008972002 +0400
-+++ b/configure.in	2010-07-07 03:33:05.788972002 +0400
+--- a/configure.in
++++ b/configure.in
 @@ -815,7 +815,7 @@
  AC_HEADER_STDC
  AC_HEADER_SYS_WAIT
@@ -17,9 +16,8 @@
   stdlib.h stddef.h \
   strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
   sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-07-07 03:33:05.278972002 +0400
-+++ b/sql/mysqld.cc	2010-07-07 03:33:05.788972002 +0400
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
 @@ -55,6 +55,10 @@
  #include "sp_rcontext.h"
  #include "sp_cache.h"

=== modified file 'patches/control_online_alter_index.patch'
--- patches/control_online_alter_index.patch	2011-06-23 02:18:22 +0000
+++ patches/control_online_alter_index.patch	2011-07-27 11:11:52 +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-07-21 22:49:53.660561079 +0900
-+++ b/sql/handler.h	2010-07-21 22:50:24.106530090 +0900
+--- a/sql/handler.h
++++ b/sql/handler.h
 @@ -169,6 +169,19 @@
  #define HA_ONLINE_DROP_UNIQUE_INDEX             (1L << 9) /*drop uniq. online*/
  #define HA_ONLINE_ADD_PK_INDEX                  (1L << 10)/*add prim. online*/
@@ -28,9 +27,8 @@
  /*
    HA_PARTITION_FUNCTION_SUPPORTED indicates that the function is
    supported at all.
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-07-21 22:49:54.011529414 +0900
-+++ b/sql/mysqld.cc	2010-07-21 22:50:24.112527179 +0900
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
 @@ -5898,6 +5898,7 @@
    OPT_USERSTAT_RUNNING,
    OPT_THREAD_STATISTICS,
@@ -53,9 +51,8 @@
    {"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax. This mode "
     "will also set transaction isolation level 'serializable'.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-diff -ruN a/sql/set_var.cc b/sql/set_var.cc
---- a/sql/set_var.cc	2010-07-21 22:49:54.019529438 +0900
-+++ b/sql/set_var.cc	2010-07-21 22:50:24.122532110 +0900
+--- a/sql/set_var.cc
++++ b/sql/set_var.cc
 @@ -758,6 +758,11 @@
  sys_engine_condition_pushdown(&vars, "engine_condition_pushdown",
  			      &SV::engine_condition_pushdown);
@@ -68,9 +65,8 @@
  #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
  /* ndb thread specific variable settings */
  static sys_var_thd_ulong
-diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h	2010-07-21 22:49:53.742561560 +0900
-+++ b/sql/sql_class.h	2010-07-21 22:50:24.130529404 +0900
+--- a/sql/sql_class.h
++++ b/sql/sql_class.h
 @@ -381,6 +381,8 @@
    my_bool ndb_use_transactions;
    my_bool ndb_index_stat_enable;
@@ -80,9 +76,8 @@
    my_bool old_alter_table;
    my_bool old_passwords;
  
-diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc
---- a/sql/sql_partition.cc	2010-06-04 00:50:11.000000000 +0900
-+++ b/sql/sql_partition.cc	2010-07-21 22:50:24.140530183 +0900
+--- a/sql/sql_partition.cc
++++ b/sql/sql_partition.cc
 @@ -4381,7 +4381,12 @@
          alter_info->no_parts= curr_part_no - new_part_no;
        }
@@ -97,9 +92,8 @@
      {
        my_error(ER_PARTITION_FUNCTION_FAILURE, MYF(0));
        DBUG_RETURN(1);
-diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
---- a/sql/sql_table.cc	2010-06-04 00:50:11.000000000 +0900
-+++ b/sql/sql_table.cc	2010-07-21 22:50:24.146531063 +0900
+--- a/sql/sql_table.cc
++++ b/sql/sql_table.cc
 @@ -7003,6 +7003,10 @@
      uint  *idx_end_p;
  

=== modified file 'patches/error_pad.patch'
--- patches/error_pad.patch	2011-06-23 02:18:22 +0000
+++ patches/error_pad.patch	2011-07-27 11:11:52 +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	2010-08-03 17:24:24.000000000 +0000
-+++ b/extra/comp_err.c	2010-09-14 16:49:28.000000000 +0000
+--- a/extra/comp_err.c
++++ b/extra/comp_err.c
 @@ -30,11 +30,12 @@
  #include <assert.h>
  #include <my_dir.h>

=== modified file 'patches/fix-bug671764.patch'
--- patches/fix-bug671764.patch	2011-07-01 10:47:59 +0000
+++ patches/fix-bug671764.patch	2011-07-27 11:11:52 +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/configure.in b/configure.in
---- a/configure.in	2010-11-29 18:45:47.000000000 +0000
-+++ b/configure.in	2010-11-29 18:45:51.000000000 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -2776,7 +2776,7 @@
      MAN_DROP="$MAN_DROP embedded"
      grep -v 'embedded' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL

=== modified file 'patches/i_s_innodb_buffer_pool_pages.patch'
--- patches/i_s_innodb_buffer_pool_pages.patch	2011-06-23 02:18:22 +0000
+++ patches/i_s_innodb_buffer_pool_pages.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-07-14 15:57:23.322321253 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-07-14 16:04:45.521321527 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -269,14 +269,6 @@
  UNIV_INTERN ibool		buf_debug_prints = FALSE;
  #endif /* UNIV_DEBUG */
@@ -23,9 +22,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  /********************************************************************//**
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 15:55:25.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:04:05.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11256,6 +11256,9 @@
    innobase_system_variables, /* system variables */
    NULL /* reserved */
@@ -36,9 +34,8 @@
  i_s_innodb_trx,
  i_s_innodb_locks,
  i_s_innodb_lock_waits,
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-04-29 15:28:20.000000000 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-04-29 16:04:05.000000000 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -42,6 +42,7 @@
  #include "buf0buf.h" /* for buf_pool and PAGE_ZIP_MIN_SIZE */
  #include "ha_prototypes.h" /* for innobase_convert_name() */
@@ -753,9 +750,8 @@
  /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */
  static ST_FIELD_INFO	innodb_trx_fields_info[] =
  {
-diff -ruN a/storage/innodb_plugin/handler/i_s.h b/storage/innodb_plugin/handler/i_s.h
---- a/storage/innodb_plugin/handler/i_s.h	2010-04-29 15:28:20.000000000 +0900
-+++ b/storage/innodb_plugin/handler/i_s.h	2010-04-29 16:04:05.000000000 +0900
+--- a/storage/innodb_plugin/handler/i_s.h
++++ b/storage/innodb_plugin/handler/i_s.h
 @@ -26,6 +26,9 @@
  #ifndef i_s_h
  #define i_s_h
@@ -766,9 +762,8 @@
  extern struct st_mysql_plugin	i_s_innodb_trx;
  extern struct st_mysql_plugin	i_s_innodb_locks;
  extern struct st_mysql_plugin	i_s_innodb_lock_waits;
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:03:34.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:04:05.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -27,5 +27,6 @@
  {"innodb_show_status","Improvements to SHOW INNODB STATUS","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_io","Improvements to InnoDB IO","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -776,9 +771,8 @@
 +{"innodb_buffer_pool_pages","Information of buffer pool content","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
---- a/storage/innodb_plugin/include/buf0buf.h	2010-07-14 15:57:23.333331973 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.h	2010-07-14 16:03:45.885392395 +0900
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
 @@ -1286,6 +1286,15 @@
  #define BUF_POOL_ZIP_FOLD_BPAGE(b) BUF_POOL_ZIP_FOLD((buf_block_t*) (b))
  /* @} */

=== modified file 'patches/innodb_adjust_defaults.patch'
--- patches/innodb_adjust_defaults.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_adjust_defaults.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:39:14.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:43:26.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11300,7 +11300,7 @@
  static MYSQL_SYSVAR_ULONG(use_purge_thread, srv_use_purge_thread,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,

=== modified file 'patches/innodb_admin_command_base.patch'
--- patches/innodb_admin_command_base.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_admin_command_base.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:27:30.222410116 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:27:44.073104773 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11612,6 +11612,7 @@
  i_s_innodb_cmpmem_reset,
  i_s_innodb_table_stats,
@@ -16,9 +15,8 @@
  i_s_innodb_patches
  mysql_declare_plugin_end;
  
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:22:04.261021936 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:27:44.077058655 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -2947,3 +2947,139 @@
  	STRUCT_FLD(system_vars, NULL),
  	STRUCT_FLD(__reserved1, NULL)
@@ -159,9 +157,8 @@
 +	STRUCT_FLD(system_vars, NULL),
 +	STRUCT_FLD(__reserved1, NULL)
 +};
-diff -ruN a/storage/innodb_plugin/handler/i_s.h b/storage/innodb_plugin/handler/i_s.h
---- a/storage/innodb_plugin/handler/i_s.h	2010-08-27 16:22:04.261987654 +0900
-+++ b/storage/innodb_plugin/handler/i_s.h	2010-08-27 16:27:44.079059299 +0900
+--- a/storage/innodb_plugin/handler/i_s.h
++++ b/storage/innodb_plugin/handler/i_s.h
 @@ -40,5 +40,6 @@
  extern struct st_mysql_plugin	i_s_innodb_rseg;
  extern struct st_mysql_plugin	i_s_innodb_table_stats;
@@ -169,9 +166,8 @@
 +extern struct st_mysql_plugin	i_s_innodb_admin_command;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:27:30.223001821 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:27:44.074104321 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -38,5 +38,6 @@
  {"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},

=== modified file 'patches/innodb_buffer_pool_shm.patch'
--- patches/innodb_buffer_pool_shm.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_buffer_pool_shm.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-07-14 16:32:49.669501663 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-07-14 16:40:16.149438645 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -773,10 +773,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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-07-14 16:34:18.597725479 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-07-14 16:40:16.159323612 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -198,6 +198,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 05:41:42 +0000
+++ patches/innodb_bug60788.patch	2011-07-27 11:11:52 +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/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
---- a/storage/innodb_plugin/os/os0file.c	2011-04-18 13:21:07.000000000 +0400
-+++ b/storage/innodb_plugin/os/os0file.c	2011-04-18 17:38:21.000000000 +0400
-@@ -1987,6 +1987,9 @@
+--- a/storage/innodb_plugin/os/os0file.c
++++ b/storage/innodb_plugin/os/os0file.c
+@@ -1988,6 +1988,9 @@
  			failures++;
  
  			retry = TRUE;
@@ -20,7 +19,7 @@
  		} else {
  
  			retry = FALSE;
-@@ -2119,6 +2122,7 @@
+@@ -2120,6 +2123,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;
-@@ -2159,7 +2163,18 @@
+@@ -2160,7 +2164,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--;
-@@ -2178,6 +2193,7 @@
+@@ -2179,6 +2194,7 @@
  	{
  		off_t	ret_offset;
  		ssize_t	ret;
@@ -56,7 +55,7 @@
  #ifndef UNIV_HOTBACKUP
  		ulint	i;
  #endif /* !UNIV_HOTBACKUP */
-@@ -2198,7 +2214,17 @@
+@@ -2199,7 +2215,17 @@
  		if (ret_offset < 0) {
  			ret = -1;
  		} else {
@@ -75,7 +74,7 @@
  		}
  
  #ifndef UNIV_HOTBACKUP
-@@ -2237,6 +2263,7 @@
+@@ -2238,6 +2264,7 @@
  				offset */
  {
  	ssize_t	ret;
@@ -83,7 +82,7 @@
  	off_t	offs;
  
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
-@@ -2264,7 +2291,18 @@
+@@ -2265,7 +2292,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--;
-@@ -2311,7 +2349,17 @@
+@@ -2312,7 +2350,17 @@
  			goto func_exit;
  		}
  

=== modified file 'patches/innodb_deadlock_count.patch'
--- patches/innodb_deadlock_count.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_deadlock_count.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-10 15:32:14.468241191 +0400
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-10 15:32:14.926992081 +0400
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -566,6 +566,8 @@
    (char*) &export_vars.innodb_data_written,		  SHOW_LONG},
    {"dblwr_pages_written",
@@ -17,9 +16,8 @@
    {"dblwr_writes",
    (char*) &export_vars.innodb_dblwr_writes,		  SHOW_LONG},
    {"dict_tables",
-diff -ruN a/storage/innodb_plugin/include/lock0lock.h b/storage/innodb_plugin/include/lock0lock.h
---- a/storage/innodb_plugin/include/lock0lock.h	2010-08-10 15:32:14.478241628 +0400
-+++ b/storage/innodb_plugin/include/lock0lock.h	2010-08-10 15:32:14.926992081 +0400
+--- a/storage/innodb_plugin/include/lock0lock.h
++++ b/storage/innodb_plugin/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/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-10 15:32:14.478241628 +0400
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-10 15:32:14.936991959 +0400
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -689,6 +689,7 @@
  	ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */
  	ulint innodb_buffer_pool_read_ahead;	/*!< srv_read_ahead */
@@ -39,9 +36,8 @@
  	ulint innodb_dblwr_pages_written;	/*!< srv_dblwr_pages_written */
  	ulint innodb_dblwr_writes;		/*!< srv_dblwr_writes */
  	ibool innodb_have_atomic_builtins;	/*!< HAVE_ATOMIC_BUILTINS */
-diff -ruN a/storage/innodb_plugin/lock/lock0lock.c b/storage/innodb_plugin/lock/lock0lock.c
---- a/storage/innodb_plugin/lock/lock0lock.c	2010-08-10 15:32:14.478241628 +0400
-+++ b/storage/innodb_plugin/lock/lock0lock.c	2010-08-10 15:32:14.936991959 +0400
+--- a/storage/innodb_plugin/lock/lock0lock.c
++++ b/storage/innodb_plugin/lock/lock0lock.c
 @@ -3330,6 +3330,7 @@
  		break;
  
@@ -50,9 +46,8 @@
  		fputs("*** WE ROLL BACK TRANSACTION (2)\n",
  		      lock_latest_err_file);
  		break;
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-10 15:32:14.478241628 +0400
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-10 15:32:14.936991959 +0400
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -444,7 +444,7 @@
  static ulint	srv_n_rows_updated_old		= 0;
  static ulint	srv_n_rows_deleted_old		= 0;

=== modified file 'patches/innodb_dict_size_limit.patch'
--- patches/innodb_dict_size_limit.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_dict_size_limit.patch	2011-07-27 11:11:52 +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/innodb_plugin/btr/btr0sea.c b/storage/innodb_plugin/btr/btr0sea.c
---- a/storage/innodb_plugin/btr/btr0sea.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/btr/btr0sea.c	2010-08-27 16:09:42.926020757 +0900
+--- a/storage/innodb_plugin/btr/btr0sea.c
++++ b/storage/innodb_plugin/btr/btr0sea.c
 @@ -1173,6 +1173,173 @@
  	mem_free(folds);
  }
@@ -182,9 +181,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/innodb_plugin/dict/dict0boot.c b/storage/innodb_plugin/dict/dict0boot.c
---- a/storage/innodb_plugin/dict/dict0boot.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/dict/dict0boot.c	2010-08-27 16:09:42.927104460 +0900
+--- a/storage/innodb_plugin/dict/dict0boot.c
++++ b/storage/innodb_plugin/dict/dict0boot.c
 @@ -283,6 +283,7 @@
  	system tables */
  	/*-------------------------*/
@@ -217,9 +215,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/innodb_plugin/dict/dict0crea.c b/storage/innodb_plugin/dict/dict0crea.c
---- a/storage/innodb_plugin/dict/dict0crea.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/dict/dict0crea.c	2010-08-27 16:09:42.928062387 +0900
+--- a/storage/innodb_plugin/dict/dict0crea.c
++++ b/storage/innodb_plugin/dict/dict0crea.c
 @@ -1211,6 +1211,9 @@
  		/* Foreign constraint system tables have already been
  		created, and they are ok */
@@ -242,9 +239,8 @@
  	row_mysql_unlock_data_dictionary(trx);
  
  	trx_free_for_mysql(trx);
-diff -ruN a/storage/innodb_plugin/dict/dict0dict.c b/storage/innodb_plugin/dict/dict0dict.c
---- a/storage/innodb_plugin/dict/dict0dict.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/dict/dict0dict.c	2010-08-27 16:09:42.930057360 +0900
+--- a/storage/innodb_plugin/dict/dict0dict.c
++++ b/storage/innodb_plugin/dict/dict0dict.c
 @@ -613,6 +613,8 @@
  
  	table = dict_table_get_on_id_low(table_id);
@@ -340,9 +336,8 @@
  	/* We always create search info whether or not adaptive
  	hash index is enabled or not. */
  	info = index->search_info;
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:09:22.832057795 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:09:42.939059876 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -560,6 +560,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,	  SHOW_LONG},
    {"dblwr_writes",
@@ -372,9 +367,8 @@
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(change_buffering),
  #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:09:22.832057795 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:09:42.944058939 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -32,5 +32,6 @@
  {"innodb_extra_rseg","allow to create extra rollback segments","When create new db, the new parameter allows to create more rollback segments","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_overwrite_relay_log_info","overwrite relay-log.info when slave recovery","Building as plugin, it is not used.","http://www.percona.com/docs/wiki/percona-xtradb:innodb_overwrite_relay_log_info"},
@@ -382,9 +376,8 @@
 +{"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/ibuf/ibuf0ibuf.c b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
---- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2010-08-27 15:54:18.077987587 +0900
-+++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2010-08-27 16:09:42.949020590 +0900
+--- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c
++++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 @@ -514,6 +514,7 @@
  
  	/* Use old-style record format for the insert buffer. */
@@ -393,9 +386,8 @@
  
  	dict_mem_table_add_col(table, heap, "DUMMY_COLUMN", DATA_BINARY, 0, 0);
  
-diff -ruN a/storage/innodb_plugin/include/btr0sea.h b/storage/innodb_plugin/include/btr0sea.h
---- a/storage/innodb_plugin/include/btr0sea.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/btr0sea.h	2010-08-27 16:09:42.951112397 +0900
+--- a/storage/innodb_plugin/include/btr0sea.h
++++ b/storage/innodb_plugin/include/btr0sea.h
 @@ -140,6 +140,13 @@
  				s- or x-latched, or an index page
  				for which we know that
@@ -410,9 +402,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/innodb_plugin/include/dict0dict.h b/storage/innodb_plugin/include/dict0dict.h
---- a/storage/innodb_plugin/include/dict0dict.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/dict0dict.h	2010-08-27 16:09:42.953188223 +0900
+--- a/storage/innodb_plugin/include/dict0dict.h
++++ b/storage/innodb_plugin/include/dict0dict.h
 @@ -1131,6 +1131,12 @@
  /*====================================*/
  	dict_table_t*	table,	/*!< in: table */
@@ -426,9 +417,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/innodb_plugin/include/dict0dict.ic b/storage/innodb_plugin/include/dict0dict.ic
---- a/storage/innodb_plugin/include/dict0dict.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/dict0dict.ic	2010-08-27 16:09:42.955104393 +0900
+--- a/storage/innodb_plugin/include/dict0dict.ic
++++ b/storage/innodb_plugin/include/dict0dict.ic
 @@ -786,6 +786,13 @@
  	HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold,
  		    dict_table_t*, table, ut_ad(table->cached),
@@ -456,9 +446,8 @@
  	ut_ad(!table || table->cached);
  
  	/* TODO: should get the type information from MySQL */
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:09:22.833022367 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:09:42.957104575 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -219,7 +219,7 @@
  extern ulint	srv_adaptive_checkpoint;
  
@@ -476,9 +465,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/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:09:22.834056830 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:09:42.960059093 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -391,6 +391,7 @@
  UNIV_INTERN ulint	srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */
  

=== modified file 'patches/innodb_expand_fast_index_creation.patch'
--- patches/innodb_expand_fast_index_creation.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_expand_fast_index_creation.patch	2011-07-27 11:11:52 +0000
@@ -4,9 +4,8 @@
 # Expands the applicability of InnoDB fast index creation to mysqldump,
 # 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 23:22:54.000000000 +0400
-+++ b/client/client_priv.h	2011-04-11 23:22:55.000000000 +0400
+--- a/client/client_priv.h
++++ b/client/client_priv.h
 @@ -97,5 +97,6 @@
    OPT_FIRST_SLAVE,
    OPT_ALL,
@@ -14,9 +13,8 @@
 +  OPT_INNODB_OPTIMIZE_KEYS,
    OPT_MAX_CLIENT_OPTION
  };
-diff -ruN a/client/mysqldump.c b/client/mysqldump.c
---- a/client/mysqldump.c	2011-04-11 23:22:49.000000000 +0400
-+++ b/client/mysqldump.c	2011-04-11 23:22:55.000000000 +0400
+--- a/client/mysqldump.c
++++ b/client/mysqldump.c
 @@ -45,6 +45,7 @@
  #include <m_ctype.h>
  #include <hash.h>
@@ -171,9 +169,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 23:22:55.000000000 +0400
+--- /dev/null
++++ b/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result
 @@ -0,0 +1,109 @@
 +#
 +# Test the --innodb-optimize-keys option.
@@ -284,9 +281,8 @@
 +
 +######################################
 +DROP TABLE t1, t2;
-diff -ruN a/mysql-test/suite/innodb_plugin/r/innodb.result b/mysql-test/suite/innodb_plugin/r/innodb.result
---- a/mysql-test/suite/innodb_plugin/r/innodb.result	2011-02-11 22:49:37.000000000 +0300
-+++ b/mysql-test/suite/innodb_plugin/r/innodb.result	2011-04-11 23:22:55.000000000 +0400
+--- a/mysql-test/suite/innodb_plugin/r/innodb.result
++++ b/mysql-test/suite/innodb_plugin/r/innodb.result
 @@ -1679,7 +1679,7 @@
  71
  SELECT variable_value - @innodb_rows_inserted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_inserted';
@@ -296,9 +292,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_plugin/t/innodb-index.test b/mysql-test/suite/innodb_plugin/t/innodb-index.test
---- a/mysql-test/suite/innodb_plugin/t/innodb-index.test	2011-02-11 22:49:34.000000000 +0300
-+++ b/mysql-test/suite/innodb_plugin/t/innodb-index.test	2011-04-11 23:22:55.000000000 +0400
+--- a/mysql-test/suite/innodb_plugin/t/innodb-index.test
++++ b/mysql-test/suite/innodb_plugin/t/innodb-index.test
 @@ -38,6 +38,11 @@
  show create table t1;
  --error ER_MULTIPLE_PRI_KEY
@@ -311,9 +306,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_plugin/t/innodb.test b/mysql-test/suite/innodb_plugin/t/innodb.test
---- a/mysql-test/suite/innodb_plugin/t/innodb.test	2011-02-11 22:49:35.000000000 +0300
-+++ b/mysql-test/suite/innodb_plugin/t/innodb.test	2011-04-11 23:22:55.000000000 +0400
+--- a/mysql-test/suite/innodb_plugin/t/innodb.test
++++ b/mysql-test/suite/innodb_plugin/t/innodb.test
 @@ -15,6 +15,12 @@
  
  -- source include/have_innodb_plugin.inc
@@ -327,9 +321,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 23:22:55.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
@@ -393,9 +386,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 23:22:49.000000000 +0400
-+++ b/sql/sql_lex.cc	2011-04-11 23:22:55.000000000 +0400
+--- a/sql/sql_lex.cc
++++ b/sql/sql_lex.cc
 @@ -1494,6 +1494,9 @@
    alter_list(rhs.alter_list, mem_root),
    key_list(rhs.key_list, mem_root),
@@ -414,9 +406,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 23:22:50.000000000 +0400
-+++ b/sql/sql_lex.h	2011-04-11 23:22:55.000000000 +0400
+--- a/sql/sql_lex.h
++++ b/sql/sql_lex.h
 @@ -896,6 +896,9 @@
    List<Alter_column>            alter_list;
    List<Key>                     key_list;
@@ -446,9 +437,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 23:22:40.000000000 +0400
-+++ b/sql/sql_table.cc	2011-04-11 23:44:23.000000000 +0400
+--- a/sql/sql_table.cc
++++ b/sql/sql_table.cc
 @@ -2559,7 +2559,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-06-23 02:18:22 +0000
+++ patches/innodb_expand_import.patch	2011-07-27 11:11:52 +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/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-04-29 15:44:28.000000000 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-04-30 10:43:13.000000000 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -40,6 +40,12 @@
  #include "dict0dict.h"
  #include "page0page.h"
@@ -497,9 +496,8 @@
  	ut_free(buf2);
  
  	if (UNIV_UNLIKELY(space_id != id
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:54:08.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 10:28:05.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -7125,6 +7125,14 @@
  		err = row_discard_tablespace_for_mysql(dict_table->name, trx);
  	} else {
@@ -535,9 +533,8 @@
    MYSQL_SYSVAR(extra_rsegments),
    MYSQL_SYSVAR(dict_size_limit),
    MYSQL_SYSVAR(use_sys_malloc),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 18:58:20.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-30 10:28:05.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -32,6 +32,7 @@
  {"innodb_extra_rseg","allow to create extra rollback segments","When create new db, the new parameter allows to create more rollback segments","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_overwrite_relay_log_info","overwrite relay-log.info when slave recovery","Building as plugin, it is not used.","http://www.percona.com/docs/wiki/percona-xtradb:innodb_overwrite_relay_log_info"},
@@ -546,9 +543,8 @@
  {"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-04-29 16:54:08.000000000 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-04-30 10:28:05.000000000 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -218,6 +218,8 @@
  extern ulint	srv_read_ahead;
  extern ulint	srv_adaptive_checkpoint;
@@ -558,9 +554,8 @@
  extern ulint	srv_extra_rsegments;
  extern ulint	srv_dict_size_limit;
  /*-------------------------------------------*/
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-04-29 18:58:20.000000000 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-04-30 10:28:05.000000000 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -390,6 +390,8 @@
  UNIV_INTERN ulint	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
  UNIV_INTERN ulint	srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */

=== modified file 'patches/innodb_expand_undo_slots.patch'
--- patches/innodb_expand_undo_slots.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_expand_undo_slots.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:06:22.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:06:59.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -165,6 +165,7 @@
  #endif /* UNIV_LOG_ARCHIVE */
  static my_bool	innobase_use_doublewrite		= TRUE;
@@ -47,9 +46,8 @@
    MYSQL_SYSVAR(fast_shutdown),
    MYSQL_SYSVAR(file_io_threads),
    MYSQL_SYSVAR(read_io_threads),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:06:22.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:06:59.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -28,5 +28,6 @@
  {"innodb_io","Improvements to InnoDB IO","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_opt_lru_count","Fix of buffer_pool mutex","Decreases contention on buffer_pool mutex on LRU operations","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -57,9 +55,8 @@
 +{"innodb_expand_undo_slots","expandable maximum number of undo slots","from 1024 (default) to about 4000","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-04-29 15:55:25.000000000 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-04-29 16:06:59.000000000 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -112,6 +112,8 @@
  extern ulint*	srv_data_file_sizes;
  extern ulint*	srv_data_file_is_raw_partition;
@@ -69,9 +66,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/innodb_plugin/include/trx0rseg.h b/storage/innodb_plugin/include/trx0rseg.h
---- a/storage/innodb_plugin/include/trx0rseg.h	2010-04-06 23:07:13.000000000 +0900
-+++ b/storage/innodb_plugin/include/trx0rseg.h	2010-04-29 16:06:59.000000000 +0900
+--- a/storage/innodb_plugin/include/trx0rseg.h
++++ b/storage/innodb_plugin/include/trx0rseg.h
 @@ -123,8 +123,11 @@
  	trx_rseg_t*	rseg);		/* in, own: instance to free */
  
@@ -85,9 +81,8 @@
  
  /* Maximum number of transactions supported by a single rollback segment */
  #define TRX_RSEG_MAX_N_TRXS	(TRX_RSEG_N_SLOTS / 2)
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-04-29 15:55:25.000000000 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-04-29 16:06:59.000000000 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -142,6 +142,8 @@
  /* size in database pages */
  UNIV_INTERN ulint*	srv_data_file_sizes = NULL;
@@ -97,9 +92,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/innodb_plugin/trx/trx0undo.c b/storage/innodb_plugin/trx/trx0undo.c
---- a/storage/innodb_plugin/trx/trx0undo.c	2010-04-06 23:07:14.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0undo.c	2010-04-29 16:06:59.000000000 +0900
+--- a/storage/innodb_plugin/trx/trx0undo.c
++++ b/storage/innodb_plugin/trx/trx0undo.c
 @@ -1395,9 +1395,47 @@
  	rseg_header = trx_rsegf_get_new(rseg->space, rseg->zip_size,
  					rseg->page_no, &mtr);

=== modified file 'patches/innodb_extend_slow.patch'
--- patches/innodb_extend_slow.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_extend_slow.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:13:11.061058561 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:30:47.341987400 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -51,6 +51,40 @@
  #include "dict0dict.h"
  #include "log0recv.h"
@@ -238,9 +237,8 @@
  	return(TRUE);
  }
  
-diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:23:31.014020792 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:30:47.342987531 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -75,7 +75,8 @@
  			treat the tablespace as dropped; this is a timestamp we
  			use to stop dangling page reads from a tablespace
@@ -334,9 +332,8 @@
  		}
  	}
  
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:15:55.187400372 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:30:47.346992376 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -4373,7 +4373,7 @@
  				 node->name, node->handle, buf,
  				 offset_low, offset_high,
@@ -375,9 +372,8 @@
  #endif
  	ut_a(ret);
  
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:30:34.589021493 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:30:47.356987871 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -1391,6 +1391,16 @@
  	trx->check_unique_secondary = !thd_test_options(
  		thd, OPTION_RELAXED_UNIQUE_CHECKS);
@@ -454,9 +450,8 @@
  
  		trx->mysql_n_tables_locked = 0;
  		prebuilt->used_in_HANDLER = FALSE;
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:30:34.590004526 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:30:47.361987777 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -40,5 +40,6 @@
  {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -464,9 +459,8 @@
 +{"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/buf0rea.h b/storage/innodb_plugin/include/buf0rea.h
---- a/storage/innodb_plugin/include/buf0rea.h	2010-08-27 15:54:18.078987755 +0900
-+++ b/storage/innodb_plugin/include/buf0rea.h	2010-08-27 16:30:47.363031394 +0900
+--- a/storage/innodb_plugin/include/buf0rea.h
++++ b/storage/innodb_plugin/include/buf0rea.h
 @@ -27,6 +27,7 @@
  #define buf0rea_h
  
@@ -496,9 +490,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/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h
---- a/storage/innodb_plugin/include/fil0fil.h	2010-08-27 15:52:14.325059269 +0900
-+++ b/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:30:47.365059512 +0900
+--- a/storage/innodb_plugin/include/fil0fil.h
++++ b/storage/innodb_plugin/include/fil0fil.h
 @@ -610,9 +610,12 @@
  Reads or writes data. This operation is asynchronous (aio).
  @return DB_SUCCESS, or DB_TABLESPACE_DELETED if we are trying to do
@@ -524,9 +517,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/innodb_plugin/include/os0file.h b/storage/innodb_plugin/include/os0file.h
---- a/storage/innodb_plugin/include/os0file.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/os0file.h	2010-08-27 16:30:47.366987560 +0900
+--- a/storage/innodb_plugin/include/os0file.h
++++ b/storage/innodb_plugin/include/os0file.h
 @@ -36,6 +36,7 @@
  #define os0file_h
  
@@ -572,9 +564,8 @@
  /************************************************************************//**
  Wakes up all async i/o threads so that they know to exit themselves in
  shutdown. */
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:27:30.225055856 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:30:47.367988259 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -62,6 +62,9 @@
  #define SRV_AUTO_EXTEND_INCREMENT	\
  	(srv_auto_extend_increment * ((1024 * 1024) / UNIV_PAGE_SIZE))
@@ -585,9 +576,8 @@
  /* This is set to TRUE if the MySQL user has set it in MySQL */
  extern ibool	srv_lower_case_table_names;
  
-diff -ruN a/storage/innodb_plugin/include/trx0trx.h b/storage/innodb_plugin/include/trx0trx.h
---- a/storage/innodb_plugin/include/trx0trx.h	2010-08-27 16:08:45.301058614 +0900
-+++ b/storage/innodb_plugin/include/trx0trx.h	2010-08-27 16:30:47.369989369 +0900
+--- a/storage/innodb_plugin/include/trx0trx.h
++++ b/storage/innodb_plugin/include/trx0trx.h
 @@ -738,6 +738,17 @@
  	/*------------------------------*/
  	char detailed_error[256];	/*!< detailed error message for last
@@ -606,9 +596,8 @@
  };
  
  #define TRX_MAX_N_THREADS	32	/* maximum number of
-diff -ruN a/storage/innodb_plugin/lock/lock0lock.c b/storage/innodb_plugin/lock/lock0lock.c
---- a/storage/innodb_plugin/lock/lock0lock.c	2010-08-27 15:52:14.332058513 +0900
-+++ b/storage/innodb_plugin/lock/lock0lock.c	2010-08-27 16:30:47.374058285 +0900
+--- a/storage/innodb_plugin/lock/lock0lock.c
++++ b/storage/innodb_plugin/lock/lock0lock.c
 @@ -1757,6 +1757,8 @@
  {
  	lock_t*	lock;
@@ -649,9 +638,8 @@
  	trx->que_state = TRX_QUE_LOCK_WAIT;
  	trx->was_chosen_as_deadlock_victim = FALSE;
  	trx->wait_started = time(NULL);
-diff -ruN a/storage/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
---- a/storage/innodb_plugin/os/os0file.c	2010-08-27 16:23:31.038058669 +0900
-+++ b/storage/innodb_plugin/os/os0file.c	2010-08-27 16:30:47.380058815 +0900
+--- a/storage/innodb_plugin/os/os0file.c
++++ b/storage/innodb_plugin/os/os0file.c
 @@ -38,6 +38,8 @@
  #include "srv0start.h"
  #include "fil0fil.h"
@@ -661,7 +649,7 @@
  #include "log0recv.h"
  #ifndef UNIV_HOTBACKUP
  # include "os0sync.h"
-@@ -2097,22 +2099,30 @@
+@@ -2098,22 +2100,30 @@
  /*******************************************************************//**
  Does a synchronous read operation in Posix.
  @return	number of bytes read, -1 if error */
@@ -694,7 +682,7 @@
  
  	ut_a((offset & 0xFFFFFFFFUL) == offset);
  
-@@ -2133,6 +2143,15 @@
+@@ -2134,6 +2144,15 @@
  
  	os_n_file_reads++;
  
@@ -710,7 +698,7 @@
  #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
  	os_mutex_enter(os_file_count_mutex);
  	os_file_n_pending_preads++;
-@@ -2146,6 +2165,13 @@
+@@ -2147,6 +2166,13 @@
  	os_n_pending_reads--;
  	os_mutex_exit(os_file_count_mutex);
  
@@ -724,7 +712,7 @@
  	return(n_bytes);
  #else
  	{
-@@ -2182,6 +2208,13 @@
+@@ -2183,6 +2209,13 @@
  		os_n_pending_reads--;
  		os_mutex_exit(os_file_count_mutex);
  
@@ -738,7 +726,7 @@
  		return(ret);
  	}
  #endif
-@@ -2312,7 +2345,7 @@
+@@ -2313,7 +2346,7 @@
  @return	TRUE if request was successful, FALSE if fail */
  UNIV_INTERN
  ibool
@@ -747,7 +735,7 @@
  /*=========*/
  	os_file_t	file,	/*!< in: handle to a file */
  	void*		buf,	/*!< in: buffer where to read */
-@@ -2320,7 +2353,8 @@
+@@ -2321,7 +2354,8 @@
  				offset where to read */
  	ulint		offset_high, /*!< in: most significant 32 bits of
  				offset */
@@ -757,7 +745,7 @@
  {
  #ifdef __WIN__
  	BOOL		ret;
-@@ -2395,7 +2429,7 @@
+@@ -2396,7 +2430,7 @@
  	os_bytes_read_since_printout += n;
  
  try_again:
@@ -766,7 +754,7 @@
  
  	if ((ulint)ret == n) {
  
-@@ -3652,10 +3686,11 @@
+@@ -3653,10 +3687,11 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
  				OS_AIO_SYNC */
@@ -779,7 +767,7 @@
  {
  	os_aio_array_t*	array;
  	os_aio_slot_t*	slot;
-@@ -3697,8 +3732,8 @@
+@@ -3698,8 +3733,8 @@
  		wait in the Windows case. */
  
  		if (type == OS_FILE_READ) {
@@ -790,7 +778,7 @@
  		}
  
  		ut_a(type == OS_FILE_WRITE);
-@@ -3731,6 +3766,11 @@
+@@ -3732,6 +3767,11 @@
  		ut_error;
  	}
  
@@ -802,9 +790,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/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:27:30.233022109 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:30:47.384058509 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -86,6 +86,9 @@
  #include "trx0i_s.h"
  #include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */
@@ -860,9 +847,8 @@
  	os_fast_mutex_lock(&srv_conc_mutex);
  
  	srv_conc_n_waiting_threads--;
-diff -ruN a/storage/innodb_plugin/trx/trx0trx.c b/storage/innodb_plugin/trx/trx0trx.c
---- a/storage/innodb_plugin/trx/trx0trx.c	2010-08-27 16:08:45.306058896 +0900
-+++ b/storage/innodb_plugin/trx/trx0trx.c	2010-08-27 16:30:47.387058330 +0900
+--- a/storage/innodb_plugin/trx/trx0trx.c
++++ b/storage/innodb_plugin/trx/trx0trx.c
 @@ -179,6 +179,15 @@
  	trx->global_read_view = NULL;
  	trx->read_view = NULL;

=== modified file 'patches/innodb_extra_rseg.patch'
--- patches/innodb_extra_rseg.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_extra_rseg.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 15:56:27.388990435 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 15:57:21.943242617 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11177,6 +11177,11 @@
    "Enable/Disable unsafe group commit when support_xa=OFF and use with binlog or other XA storage engine.",
    NULL, NULL, 0, 0, 1, 0);
@@ -36,9 +35,8 @@
  i_s_innodb_buffer_pool_pages,
  i_s_innodb_buffer_pool_pages_index,
  i_s_innodb_buffer_pool_pages_blob,
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-08-27 15:55:39.396056760 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-08-27 15:57:21.946209184 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -43,6 +43,8 @@
  #include "ha_prototypes.h" /* for innobase_convert_name() */
  #include "srv0start.h" /* for srv_was_started */
@@ -215,9 +213,8 @@
 +	/* void* */
 +	STRUCT_FLD(__reserved1, NULL)
 +};
-diff -ruN a/storage/innodb_plugin/handler/i_s.h b/storage/innodb_plugin/handler/i_s.h
---- a/storage/innodb_plugin/handler/i_s.h	2010-08-27 15:55:39.398061420 +0900
-+++ b/storage/innodb_plugin/handler/i_s.h	2010-08-27 15:57:21.948402335 +0900
+--- a/storage/innodb_plugin/handler/i_s.h
++++ b/storage/innodb_plugin/handler/i_s.h
 @@ -37,5 +37,6 @@
  extern struct st_mysql_plugin	i_s_innodb_cmpmem;
  extern struct st_mysql_plugin	i_s_innodb_cmpmem_reset;
@@ -225,9 +222,8 @@
 +extern struct st_mysql_plugin	i_s_innodb_rseg;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 15:56:27.390020919 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 15:57:21.943242617 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -29,5 +29,6 @@
  {"innodb_opt_lru_count","Fix of buffer_pool mutex","Decreases contention on buffer_pool mutex on LRU operations","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_buffer_pool_pages","Information of buffer pool content","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -235,9 +231,8 @@
 +{"innodb_extra_rseg","allow to create extra rollback segments","When create new db, the new parameter allows to create more rollback segments","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 15:56:27.391059197 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 15:57:21.949178913 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -216,6 +216,8 @@
  extern ulint	srv_read_ahead;
  extern ulint	srv_adaptive_checkpoint;
@@ -247,9 +242,8 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-diff -ruN a/storage/innodb_plugin/include/trx0rseg.h b/storage/innodb_plugin/include/trx0rseg.h
---- a/storage/innodb_plugin/include/trx0rseg.h	2010-08-27 15:56:27.392056954 +0900
-+++ b/storage/innodb_plugin/include/trx0rseg.h	2010-08-27 15:57:21.951103043 +0900
+--- a/storage/innodb_plugin/include/trx0rseg.h
++++ b/storage/innodb_plugin/include/trx0rseg.h
 @@ -114,6 +114,17 @@
  /*=========================*/
  	trx_sysf_t*	sys_header,	/*!< in: trx system header */
@@ -268,9 +262,8 @@
  /***************************************************************************
  Free's an instance of the rollback segment in memory. */
  UNIV_INTERN
-diff -ruN a/storage/innodb_plugin/include/trx0sys.h b/storage/innodb_plugin/include/trx0sys.h
---- a/storage/innodb_plugin/include/trx0sys.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/trx0sys.h	2010-08-27 15:57:21.952410637 +0900
+--- a/storage/innodb_plugin/include/trx0sys.h
++++ b/storage/innodb_plugin/include/trx0sys.h
 @@ -134,6 +134,13 @@
  void
  trx_sys_create(void);
@@ -285,9 +278,8 @@
  /****************************************************************//**
  Looks for a free slot for a rollback segment in the trx system file copy.
  @return	slot index or ULINT_UNDEFINED if not found */
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 15:56:27.393071672 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 15:57:21.956058333 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -388,6 +388,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 */
@@ -297,9 +289,8 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-08-27 15:54:18.103988092 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-08-27 15:57:21.959058733 +0900
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -1533,6 +1533,14 @@
  		dict_create();
  		srv_startup_is_before_trx_rollback_phase = FALSE;
@@ -315,9 +306,8 @@
  #ifdef UNIV_LOG_ARCHIVE
  	} else if (srv_archive_recovery) {
  		fprintf(stderr,
-diff -ruN a/storage/innodb_plugin/trx/trx0rseg.c b/storage/innodb_plugin/trx/trx0rseg.c
---- a/storage/innodb_plugin/trx/trx0rseg.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0rseg.c	2010-08-27 15:57:21.961059126 +0900
+--- a/storage/innodb_plugin/trx/trx0rseg.c
++++ b/storage/innodb_plugin/trx/trx0rseg.c
 @@ -286,3 +286,39 @@
  		}
  	}
@@ -358,9 +348,8 @@
 +
 +	return(rseg);
 +}
-diff -ruN a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
---- a/storage/innodb_plugin/trx/trx0sys.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0sys.c	2010-08-27 15:57:21.963058358 +0900
+--- a/storage/innodb_plugin/trx/trx0sys.c
++++ b/storage/innodb_plugin/trx/trx0sys.c
 @@ -1044,6 +1044,31 @@
  	trx_sys_init_at_db_start();
  }

=== modified file 'patches/innodb_fast_checksum.patch'
--- patches/innodb_fast_checksum.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_fast_checksum.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:40:36.508988536 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:42:03.596041861 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -343,6 +343,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/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c
---- a/storage/innodb_plugin/buf/buf0flu.c	2010-08-27 16:38:38.226023489 +0900
-+++ b/storage/innodb_plugin/buf/buf0flu.c	2010-08-27 16:42:03.597411439 +0900
+--- a/storage/innodb_plugin/buf/buf0flu.c
++++ b/storage/innodb_plugin/buf/buf0flu.c
 @@ -957,7 +957,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/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:40:36.522990504 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:42:03.602023484 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -3150,7 +3150,9 @@
  			mach_write_ull(page + FIL_PAGE_FILE_FLUSH_LSN, current_lsn);
  		mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,
@@ -159,9 +156,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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:40:36.538021443 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:42:03.611021803 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -185,6 +185,7 @@
  #endif /* UNIV_LOG_ARCHIVE */
  static my_bool	innobase_use_doublewrite		= TRUE;
@@ -202,9 +198,8 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:40:36.560063279 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:42:03.615988127 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -44,5 +44,6 @@
  {"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -212,9 +207,8 @@
 +{"innodb_fast_checksum","Using the checksum on 32bit-unit calculation","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
---- a/storage/innodb_plugin/include/buf0buf.h	2010-08-27 16:40:36.563059330 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.h	2010-08-27 16:42:03.638058638 +0900
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
 @@ -477,6 +477,11 @@
  buf_calc_page_new_checksum(
  /*=======================*/
@@ -227,9 +221,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/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h
---- a/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:40:36.572063042 +0900
-+++ b/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:42:03.640021168 +0900
+--- a/storage/innodb_plugin/include/fil0fil.h
++++ b/storage/innodb_plugin/include/fil0fil.h
 @@ -117,6 +117,7 @@
  #define FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID  34 /*!< starting from 4.1.x this
  					contains the space id of the page */
@@ -238,9 +231,8 @@
  /* @} */
  /** File page trailer @{ */
  #define FIL_PAGE_END_LSN_OLD_CHKSUM 8	/*!< the low 4 bytes of this are used
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:40:36.580092150 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:42:03.640988120 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -212,6 +212,7 @@
  
  extern ibool	srv_use_doublewrite_buf;
@@ -249,9 +241,8 @@
  
  extern ibool	srv_set_thread_priorities;
  extern int	srv_query_thread_priority;
-diff -ruN a/storage/innodb_plugin/include/ut0rnd.h b/storage/innodb_plugin/include/ut0rnd.h
---- a/storage/innodb_plugin/include/ut0rnd.h	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/include/ut0rnd.h	2010-08-27 16:42:03.642990139 +0900
+--- a/storage/innodb_plugin/include/ut0rnd.h
++++ b/storage/innodb_plugin/include/ut0rnd.h
 @@ -124,6 +124,13 @@
  	const byte*	str,	/*!< in: string of bytes */
  	ulint		len)	/*!< in: length */
@@ -266,9 +257,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/innodb_plugin/include/ut0rnd.ic b/storage/innodb_plugin/include/ut0rnd.ic
---- a/storage/innodb_plugin/include/ut0rnd.ic	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/include/ut0rnd.ic	2010-08-27 16:42:03.643990557 +0900
+--- a/storage/innodb_plugin/include/ut0rnd.ic
++++ b/storage/innodb_plugin/include/ut0rnd.ic
 @@ -226,3 +226,28 @@
  
  	return(fold);
@@ -298,9 +288,8 @@
 +
 +	return(fold);
 +}
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:40:36.599058304 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:42:03.647012289 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -387,6 +387,7 @@
  
  UNIV_INTERN ibool	srv_use_doublewrite_buf	= TRUE;

=== modified file 'patches/innodb_fast_shutdown.patch'
--- patches/innodb_fast_shutdown.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_fast_shutdown.patch	2011-07-27 11:11:52 +0000
@@ -11,9 +11,8 @@
 # suite.
 #
 # The patch also implements os_event_wait_time() for POSIX systems.
-diff -ruN /dev/null b/COPYING.innodb_fast_shutdown
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/COPYING.innodb_fast_shutdown	2010-11-16 21:37:51.000000000 +0300
+--- /dev/null
++++ b/COPYING.innodb_fast_shutdown
 @@ -0,0 +1,10 @@
 +Copyright (c) 2010, Kristian Nielsen
 +All rights reserved.
@@ -25,9 +24,8 @@
 +    * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 +
 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -ruN a/storage/innodb_plugin/include/os0sync.h b/storage/innodb_plugin/include/os0sync.h
---- a/storage/innodb_plugin/include/os0sync.h	2010-11-16 21:33:00.000000000 +0300
-+++ b/storage/innodb_plugin/include/os0sync.h	2010-11-16 21:34:06.000000000 +0300
+--- a/storage/innodb_plugin/include/os0sync.h
++++ b/storage/innodb_plugin/include/os0sync.h
 @@ -189,14 +189,14 @@
  
  /**********************************************************//**
@@ -45,9 +43,8 @@
  				OS_SYNC_INFINITE_TIME */
  #ifdef __WIN__
  /**********************************************************//**
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-11-16 21:33:00.000000000 +0300
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-11-16 21:34:06.000000000 +0300
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -57,6 +57,9 @@
  thread starts running */
  extern os_event_t	srv_lock_timeout_thread_event;
@@ -58,9 +55,8 @@
  /* If the last data file is auto-extended, we add this many pages to it
  at a time */
  #define SRV_AUTO_EXTEND_INCREMENT	\
-diff -ruN a/storage/innodb_plugin/log/log0log.c b/storage/innodb_plugin/log/log0log.c
---- a/storage/innodb_plugin/log/log0log.c	2010-11-16 21:33:00.000000000 +0300
-+++ b/storage/innodb_plugin/log/log0log.c	2010-11-16 21:34:06.000000000 +0300
+--- a/storage/innodb_plugin/log/log0log.c
++++ b/storage/innodb_plugin/log/log0log.c
 @@ -3103,6 +3103,7 @@
  	algorithm only works if the server is idle at shutdown */
  
@@ -69,9 +65,8 @@
  loop:
  	os_thread_sleep(100000);
  
-diff -ruN a/storage/innodb_plugin/os/os0sync.c b/storage/innodb_plugin/os/os0sync.c
---- a/storage/innodb_plugin/os/os0sync.c	2010-11-16 21:33:00.000000000 +0300
-+++ b/storage/innodb_plugin/os/os0sync.c	2010-11-16 21:34:06.000000000 +0300
+--- a/storage/innodb_plugin/os/os0sync.c
++++ b/storage/innodb_plugin/os/os0sync.c
 @@ -31,6 +31,9 @@
  
  #ifdef __WIN__
@@ -162,9 +157,8 @@
  #endif
  }
  
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-11-16 21:33:00.000000000 +0300
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-11-16 21:34:06.000000000 +0300
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -708,6 +708,8 @@
  
  UNIV_INTERN os_event_t	srv_lock_timeout_thread_event;

=== modified file 'patches/innodb_files_extend.patch'
--- patches/innodb_files_extend.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_files_extend.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buddy.c b/storage/innodb_plugin/buf/buf0buddy.c
---- a/storage/innodb_plugin/buf/buf0buddy.c	2010-08-27 16:13:11.055058310 +0900
-+++ b/storage/innodb_plugin/buf/buf0buddy.c	2010-08-27 16:44:21.664059035 +0900
+--- a/storage/innodb_plugin/buf/buf0buddy.c
++++ b/storage/innodb_plugin/buf/buf0buddy.c
 @@ -43,7 +43,7 @@
  #endif /* UNIV_DEBUG */
  /** Statistics of the buddy system, indexed by block size.
@@ -17,9 +16,8 @@
  
  /**********************************************************************//**
  Get the offset of the buddy of a compressed page frame.
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:43:11.941989968 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:44:21.668058937 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -690,7 +690,7 @@
  		ut_a(space->purpose != FIL_LOG);
  		ut_a(!trx_sys_sys_space(space->id));
@@ -60,9 +58,8 @@
  	ut_ad(fil_validate());
  #ifndef UNIV_HOTBACKUP
  # ifndef UNIV_LOG_DEBUG
-diff -ruN a/storage/innodb_plugin/fsp/fsp0fsp.c b/storage/innodb_plugin/fsp/fsp0fsp.c
---- a/storage/innodb_plugin/fsp/fsp0fsp.c	2010-08-27 16:40:36.528021375 +0900
-+++ b/storage/innodb_plugin/fsp/fsp0fsp.c	2010-08-27 16:44:21.673058570 +0900
+--- a/storage/innodb_plugin/fsp/fsp0fsp.c
++++ b/storage/innodb_plugin/fsp/fsp0fsp.c
 @@ -657,16 +657,18 @@
  				0 for uncompressed pages */
  	ulint	offset)		/*!< in: page offset */
@@ -111,9 +108,8 @@
  
  		if (UNIV_UNLIKELY(init_xdes)) {
  
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:43:11.951020997 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:44:21.682059132 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -151,6 +151,9 @@
  static ulong innobase_read_io_threads;
  static ulong innobase_write_io_threads;
@@ -226,9 +222,8 @@
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:43:11.956017166 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:44:21.687100395 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -45,5 +45,6 @@
  {"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_pass_corrupt_table","Treat tables as corrupt instead of crash, when meet corrupt blocks","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -236,9 +231,8 @@
 +{"innodb_files_extend","allow >4GB transaction log files, and can vary universal page size of datafiles","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/buf0buddy.h b/storage/innodb_plugin/include/buf0buddy.h
---- a/storage/innodb_plugin/include/buf0buddy.h	2010-08-27 16:13:11.077063445 +0900
-+++ b/storage/innodb_plugin/include/buf0buddy.h	2010-08-27 16:44:21.689059215 +0900
+--- a/storage/innodb_plugin/include/buf0buddy.h
++++ b/storage/innodb_plugin/include/buf0buddy.h
 @@ -83,7 +83,7 @@
  
  /** Statistics of the buddy system, indexed by block size.
@@ -248,9 +242,8 @@
  
  #ifndef UNIV_NONINL
  # include "buf0buddy.ic"
-diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
---- a/storage/innodb_plugin/include/buf0buf.h	2010-08-27 16:43:11.959021085 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.h	2010-08-27 16:44:21.691058408 +0900
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
 @@ -1452,11 +1452,11 @@
  	/* @{ */
  	UT_LIST_BASE_NODE_T(buf_page_t)	zip_clean;
@@ -267,9 +260,8 @@
  #if BUF_BUDDY_LOW > PAGE_ZIP_MIN_SIZE
  # error "BUF_BUDDY_LOW > PAGE_ZIP_MIN_SIZE"
  #endif
-diff -ruN a/storage/innodb_plugin/include/buf0types.h b/storage/innodb_plugin/include/buf0types.h
---- a/storage/innodb_plugin/include/buf0types.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0types.h	2010-08-27 16:44:21.692071229 +0900
+--- a/storage/innodb_plugin/include/buf0types.h
++++ b/storage/innodb_plugin/include/buf0types.h
 @@ -70,12 +70,13 @@
  					buddy system; must be at least
  					sizeof(buf_page_t) */
@@ -285,9 +277,8 @@
  /* @} */
  
  #endif
-diff -ruN a/storage/innodb_plugin/include/fsp0types.h b/storage/innodb_plugin/include/fsp0types.h
---- a/storage/innodb_plugin/include/fsp0types.h	2010-11-29 19:38:03.000000000 +0900
-+++ b/storage/innodb_plugin/include/fsp0types.h	2011-02-02 23:29:13.000000000 +0900
+--- a/storage/innodb_plugin/include/fsp0types.h
++++ b/storage/innodb_plugin/include/fsp0types.h
 @@ -42,7 +42,7 @@
  /* @} */
  
@@ -297,9 +288,8 @@
  
  /** On a page of any file segment, data may be put starting from this
  offset */
-diff -ruN a/storage/innodb_plugin/include/log0log.h b/storage/innodb_plugin/include/log0log.h
---- a/storage/innodb_plugin/include/log0log.h	2010-11-03 22:39:54.000000000 +0900
-+++ b/storage/innodb_plugin/include/log0log.h	2010-12-13 20:17:00.600329611 +0900
+--- a/storage/innodb_plugin/include/log0log.h
++++ b/storage/innodb_plugin/include/log0log.h
 @@ -672,6 +672,9 @@
  					when mysqld is first time started
  					on the restored database, it can
@@ -310,9 +300,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/innodb_plugin/include/mtr0log.ic b/storage/innodb_plugin/include/mtr0log.ic
---- a/storage/innodb_plugin/include/mtr0log.ic	2010-08-27 16:38:38.273059844 +0900
-+++ b/storage/innodb_plugin/include/mtr0log.ic	2010-08-27 16:44:21.693073476 +0900
+--- a/storage/innodb_plugin/include/mtr0log.ic
++++ b/storage/innodb_plugin/include/mtr0log.ic
 @@ -203,7 +203,7 @@
  	system tablespace */
  	if ((space == TRX_SYS_SPACE
@@ -322,9 +311,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/innodb_plugin/include/os0file.h b/storage/innodb_plugin/include/os0file.h
---- a/storage/innodb_plugin/include/os0file.h	2010-12-13 20:14:59.101402758 +0900
-+++ b/storage/innodb_plugin/include/os0file.h	2010-12-13 20:17:00.602329548 +0900
+--- a/storage/innodb_plugin/include/os0file.h
++++ b/storage/innodb_plugin/include/os0file.h
 @@ -107,7 +107,7 @@
  if this fails for a log block, then it is equivalent to a media failure in the
  log. */
@@ -343,9 +331,8 @@
  /* File types for directory entry data type */
  
  enum os_file_type_enum{
-diff -ruN a/storage/innodb_plugin/include/page0types.h b/storage/innodb_plugin/include/page0types.h
---- a/storage/innodb_plugin/include/page0types.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/page0types.h	2010-08-27 16:44:21.695063547 +0900
+--- a/storage/innodb_plugin/include/page0types.h
++++ b/storage/innodb_plugin/include/page0types.h
 @@ -56,8 +56,9 @@
  
  /** Number of supported compressed page sizes */
@@ -367,9 +354,8 @@
  
  /**********************************************************************//**
  Write the "deleted" flag of a record on a compressed page.  The flag must
-diff -ruN a/storage/innodb_plugin/include/trx0sys.h b/storage/innodb_plugin/include/trx0sys.h
---- a/storage/innodb_plugin/include/trx0sys.h	2010-08-27 16:38:38.277021207 +0900
-+++ b/storage/innodb_plugin/include/trx0sys.h	2010-08-27 16:44:21.696063957 +0900
+--- a/storage/innodb_plugin/include/trx0sys.h
++++ b/storage/innodb_plugin/include/trx0sys.h
 @@ -515,9 +515,9 @@
  /** Contents of TRX_SYS_MYSQL_LOG_MAGIC_N_FLD */
  #define TRX_SYS_MYSQL_LOG_MAGIC_N	873422344
@@ -383,9 +369,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/innodb_plugin/include/univ.i b/storage/innodb_plugin/include/univ.i
---- a/storage/innodb_plugin/include/univ.i	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/univ.i	2010-08-27 16:44:21.698059254 +0900
+--- a/storage/innodb_plugin/include/univ.i
++++ b/storage/innodb_plugin/include/univ.i
 @@ -286,9 +286,13 @@
  */
  
@@ -418,9 +403,8 @@
 +extern ulint	srv_page_size_shift;
 +extern ulint	srv_page_size;
  #endif
-diff -ruN a/storage/innodb_plugin/log/log0log.c b/storage/innodb_plugin/log/log0log.c
---- a/storage/innodb_plugin/log/log0log.c	2010-08-27 16:27:30.229021112 +0900
-+++ b/storage/innodb_plugin/log/log0log.c	2010-08-27 16:44:21.701058790 +0900
+--- a/storage/innodb_plugin/log/log0log.c
++++ b/storage/innodb_plugin/log/log0log.c
 @@ -591,7 +591,9 @@
  
  	offset = (gr_lsn_size_offset + difference) % group_size;
@@ -471,9 +455,8 @@
  #endif /* UNIV_LOG_ARCHIVE */
  
  	for (i = 0; i < LOG_MAX_N_GROUPS; i++) {
-diff -ruN a/storage/innodb_plugin/log/log0recv.c b/storage/innodb_plugin/log/log0recv.c
---- a/storage/innodb_plugin/log/log0recv.c	2010-08-27 16:23:31.034058951 +0900
-+++ b/storage/innodb_plugin/log/log0recv.c	2010-08-27 16:44:21.705059074 +0900
+--- a/storage/innodb_plugin/log/log0recv.c
++++ b/storage/innodb_plugin/log/log0recv.c
 @@ -702,8 +702,22 @@
  
  			group->lsn = mach_read_ull(
@@ -526,9 +509,8 @@
  #ifdef UNIV_LOG_ARCHIVE
  	group = UT_LIST_GET_FIRST(log_sys->log_groups);
  
-diff -ruN a/storage/innodb_plugin/page/page0zip.c b/storage/innodb_plugin/page/page0zip.c
---- a/storage/innodb_plugin/page/page0zip.c	2010-08-27 16:40:36.584058988 +0900
-+++ b/storage/innodb_plugin/page/page0zip.c	2010-08-27 16:44:21.709058243 +0900
+--- a/storage/innodb_plugin/page/page0zip.c
++++ b/storage/innodb_plugin/page/page0zip.c
 @@ -49,7 +49,7 @@
  
  #ifndef UNIV_HOTBACKUP
@@ -538,9 +520,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  /* Please refer to ../include/page0zip.ic for a description of the
-diff -ruN a/storage/innodb_plugin/row/row0merge.c b/storage/innodb_plugin/row/row0merge.c
---- a/storage/innodb_plugin/row/row0merge.c	2010-08-27 16:40:36.591058306 +0900
-+++ b/storage/innodb_plugin/row/row0merge.c	2010-08-27 16:44:21.713021156 +0900
+--- a/storage/innodb_plugin/row/row0merge.c
++++ b/storage/innodb_plugin/row/row0merge.c
 @@ -92,7 +92,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
@@ -550,9 +531,8 @@
  
  /** @brief Merge record in row_merge_block_t.
  
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:43:11.968059077 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:44:21.716988122 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -217,6 +217,13 @@
  UNIV_INTERN ulint	srv_n_read_io_threads	= ULINT_MAX;
  UNIV_INTERN ulint	srv_n_write_io_threads	= ULINT_MAX;
@@ -567,9 +547,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/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:40:36.602058774 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:44:21.720021228 +0900
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -1512,10 +1512,12 @@
  	}
  #endif /* UNIV_LOG_ARCHIVE */

=== modified file 'patches/innodb_fix_misc.patch'
--- patches/innodb_fix_misc.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_fix_misc.patch	2011-07-27 11:11:52 +0000
@@ -11,9 +11,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innodb_plugin/buf/buf0buddy.c b/storage/innodb_plugin/buf/buf0buddy.c
---- a/storage/innodb_plugin/buf/buf0buddy.c	2011-06-23 17:58:32.811788353 +0900
-+++ b/storage/innodb_plugin/buf/buf0buddy.c	2011-06-23 17:59:22.291827133 +0900
+--- a/storage/innodb_plugin/buf/buf0buddy.c
++++ b/storage/innodb_plugin/buf/buf0buddy.c
 @@ -377,7 +377,9 @@
  	buf_page_t*	bpage,	/*!< in: block to relocate */
  	buf_page_t*	dpage)	/*!< in: free block to relocate to */
@@ -40,9 +39,8 @@
  
  	UNIV_MEM_INVALID(bpage, sizeof *bpage);
  
-diff -ruN a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2011-02-21 20:31:57.781983359 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2011-02-21 20:32:39.523946003 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -953,74 +953,6 @@
  	return(NULL);
  }
@@ -484,9 +482,8 @@
  
  		mutex_exit(&LRU_list_mutex);
  
-diff -ruN a/storage/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c
---- a/storage/innodb_plugin/buf/buf0flu.c	2011-02-21 20:31:57.784983260 +0900
-+++ b/storage/innodb_plugin/buf/buf0flu.c	2011-02-21 20:32:39.524915732 +0900
+--- a/storage/innodb_plugin/buf/buf0flu.c
++++ b/storage/innodb_plugin/buf/buf0flu.c
 @@ -367,7 +367,7 @@
  
  	if (UNIV_LIKELY(bpage->in_LRU_list && buf_page_in_file(bpage))) {
@@ -520,9 +517,8 @@
  		break;
  	case BUF_BLOCK_FILE_PAGE:
  		UT_LIST_REMOVE(flush_list, buf_pool->flush_list, bpage);
-diff -ruN a/storage/innodb_plugin/buf/buf0lru.c b/storage/innodb_plugin/buf/buf0lru.c
---- a/storage/innodb_plugin/buf/buf0lru.c	2011-02-21 20:31:57.451983310 +0900
-+++ b/storage/innodb_plugin/buf/buf0lru.c	2011-02-21 20:32:39.526949096 +0900
+--- a/storage/innodb_plugin/buf/buf0lru.c
++++ b/storage/innodb_plugin/buf/buf0lru.c
 @@ -550,6 +550,31 @@
  	}
  }
@@ -594,9 +590,8 @@
  
  		mutex_exit(&buf_pool_zip_mutex);
  		//buf_pool_mutex_exit_forbid();
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2011-02-21 20:31:57.838984412 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2011-02-21 20:32:39.528914782 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -242,6 +242,7 @@
  struct fil_system_struct {
  #ifndef UNIV_HOTBACKUP
@@ -790,9 +785,8 @@
  	}
  
  	ut_a(ret);
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:50:59.626327847 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:55:20.281021252 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11750,6 +11750,12 @@
    "except for the deletion.",
    NULL, NULL, 0, 0, 1, 0);
@@ -823,9 +817,8 @@
    PLUGIN_LICENSE_GPL,
    innobase_init, /* Plugin Init */
    NULL, /* Plugin Deinit */
-diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
---- a/storage/innodb_plugin/include/buf0buf.h	2011-02-21 20:31:57.863983187 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.h	2011-02-21 20:32:39.537912716 +0900
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
 @@ -141,12 +141,6 @@
  				BUF_BLOCK_ZIP_DIRTY or BUF_BLOCK_ZIP_PAGE */
  	buf_page_t*	dpage)	/*!< in/out: destination control block */
@@ -858,9 +851,8 @@
  	UT_LIST_BASE_NODE_T(buf_page_t) zip_free[BUF_BUDDY_SIZES_MAX];
  					/*!< buddy free lists */
  //#if BUF_BUDDY_HIGH != UNIV_PAGE_SIZE
-diff -ruN a/storage/innodb_plugin/include/buf0buf.ic b/storage/innodb_plugin/include/buf0buf.ic
---- a/storage/innodb_plugin/include/buf0buf.ic	2011-02-21 20:31:57.725983812 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.ic	2011-02-21 20:32:39.538913061 +0900
+--- a/storage/innodb_plugin/include/buf0buf.ic
++++ b/storage/innodb_plugin/include/buf0buf.ic
 @@ -384,6 +384,7 @@
  	buf_block_set_state(block, BUF_BLOCK_FILE_PAGE);
  	block->page.space = space;
@@ -869,9 +861,8 @@
  }
  
  /*********************************************************************//**
-diff -ruN a/storage/innodb_plugin/include/buf0lru.h b/storage/innodb_plugin/include/buf0lru.h
---- a/storage/innodb_plugin/include/buf0lru.h	2011-02-21 20:31:57.480924269 +0900
-+++ b/storage/innodb_plugin/include/buf0lru.h	2011-02-21 20:32:39.539912965 +0900
+--- a/storage/innodb_plugin/include/buf0lru.h
++++ b/storage/innodb_plugin/include/buf0lru.h
 @@ -84,6 +84,14 @@
  buf_LRU_invalidate_tablespace(
  /*==========================*/
@@ -895,9 +886,8 @@
  
  /******************************************************************//**
  Try to free a block.  If bpage is a descriptor of a compressed-only
-diff -ruN a/storage/innodb_plugin/include/os0file.h b/storage/innodb_plugin/include/os0file.h
---- a/storage/innodb_plugin/include/os0file.h	2011-02-21 20:31:57.870987755 +0900
-+++ b/storage/innodb_plugin/include/os0file.h	2011-02-21 20:32:39.540912738 +0900
+--- a/storage/innodb_plugin/include/os0file.h
++++ b/storage/innodb_plugin/include/os0file.h
 @@ -658,6 +658,7 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
@@ -926,9 +916,8 @@
  /**********************************************************************//**
  Validates the consistency of the aio system.
  @return	TRUE if ok */
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2011-02-21 20:31:57.824983518 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2011-02-21 20:32:39.541913033 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -236,6 +236,8 @@
  
  extern ulint	srv_extra_rsegments;
@@ -938,9 +927,8 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-diff -ruN a/storage/innodb_plugin/include/sync0sync.h b/storage/innodb_plugin/include/sync0sync.h
---- a/storage/innodb_plugin/include/sync0sync.h	2011-02-21 20:31:57.382982949 +0900
-+++ b/storage/innodb_plugin/include/sync0sync.h	2011-02-21 20:32:39.543913340 +0900
+--- a/storage/innodb_plugin/include/sync0sync.h
++++ b/storage/innodb_plugin/include/sync0sync.h
 @@ -496,6 +496,7 @@
  #define	SYNC_BUF_POOL		150
  #define SYNC_BUF_FLUSH_LIST	149
@@ -949,9 +937,8 @@
  #define	SYNC_ANY_LATCH		135
  #define SYNC_THR_LOCAL		133
  #define	SYNC_MEM_HASH		131
-diff -ruN a/storage/innodb_plugin/include/univ.i b/storage/innodb_plugin/include/univ.i
---- a/storage/innodb_plugin/include/univ.i	2010-04-30 16:37:05.000000000 +0900
-+++ b/storage/innodb_plugin/include/univ.i	2010-04-30 16:41:46.000000000 +0900
+--- a/storage/innodb_plugin/include/univ.i
++++ b/storage/innodb_plugin/include/univ.i
 @@ -48,6 +48,11 @@
  #define INNODB_VERSION_MINOR	0
  #define INNODB_VERSION_BUGFIX	16
@@ -983,9 +970,8 @@
  
  #define REFMAN "http://dev.mysql.com/doc/refman/5.1/en/"
  
-diff -ruN a/storage/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
---- a/storage/innodb_plugin/os/os0file.c	2011-02-21 20:31:57.437945953 +0900
-+++ b/storage/innodb_plugin/os/os0file.c	2011-02-21 20:32:39.546945763 +0900
+--- a/storage/innodb_plugin/os/os0file.c
++++ b/storage/innodb_plugin/os/os0file.c
 @@ -142,6 +142,7 @@
  //					made and only the slot message
  //					needs to be passed to the caller
@@ -994,7 +980,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
-@@ -3400,7 +3401,8 @@
+@@ -3401,7 +3402,8 @@
  				offset */
  	ulint		offset_high, /*!< in: most significant 32 bits of
  				offset */
@@ -1004,7 +990,7 @@
  {
  	os_aio_slot_t*	slot;
  	ulint		i;
-@@ -3482,6 +3484,7 @@
+@@ -3483,6 +3485,7 @@
  	slot->offset_high = offset_high;
  //	slot->io_already_done = FALSE;
  	slot->status = OS_AIO_NOT_ISSUED;
@@ -1012,7 +998,7 @@
  
  #ifdef WIN_ASYNC_IO
  	control = &(slot->control);
-@@ -3690,6 +3693,7 @@
+@@ -3691,6 +3694,7 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
  				OS_AIO_SYNC */
@@ -1020,7 +1006,7 @@
  	trx_t*		trx)
  {
  	os_aio_array_t*	array;
-@@ -3772,7 +3776,7 @@
+@@ -3773,7 +3777,7 @@
  		trx->io_read += n;
  	}
  	slot = os_aio_array_reserve_slot(type, array, message1, message2, file,
@@ -1029,7 +1015,7 @@
  	if (type == OS_FILE_READ) {
  		if (os_aio_use_native_aio) {
  #ifdef WIN_ASYNC_IO
-@@ -3882,7 +3886,8 @@
+@@ -3883,7 +3887,8 @@
  				parameters are valid and can be used to
  				restart the operation, for example */
  	void**	message2,
@@ -1039,7 +1025,7 @@
  {
  	ulint		orig_seg	= segment;
  	os_aio_array_t*	array;
-@@ -3936,6 +3941,7 @@
+@@ -3937,6 +3942,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -1047,7 +1033,7 @@
  
  	if (ret && len == slot->len) {
  		ret_val = TRUE;
-@@ -4019,7 +4025,8 @@
+@@ -4020,7 +4026,8 @@
  				parameters are valid and can be used to
  				restart the operation, for example */
  	void**	message2,
@@ -1057,7 +1043,7 @@
  {
  	os_aio_array_t*	array;
  	ulint		segment;
-@@ -4310,6 +4317,7 @@
+@@ -4311,6 +4318,7 @@
  	*message2 = slot->message2;
  
  	*type = slot->type;
@@ -1065,9 +1051,8 @@
  
  	os_mutex_exit(array->mutex);
  
-diff -ruN a/storage/innodb_plugin/row/row0mysql.c b/storage/innodb_plugin/row/row0mysql.c
---- a/storage/innodb_plugin/row/row0mysql.c	2010-07-20 16:33:04.097866666 +0900
-+++ b/storage/innodb_plugin/row/row0mysql.c	2010-07-20 16:33:53.995828763 +0900
+--- a/storage/innodb_plugin/row/row0mysql.c
++++ b/storage/innodb_plugin/row/row0mysql.c
 @@ -51,6 +51,7 @@
  #include "btr0sea.h"
  #include "fil0fil.h"
@@ -1090,9 +1075,8 @@
  	if (prebuilt->sql_stat_start) {
  		node->state = INS_NODE_SET_IX_LOCK;
  		prebuilt->sql_stat_start = FALSE;
-diff -ruN a/storage/innodb_plugin/row/row0sel.c b/storage/innodb_plugin/row/row0sel.c
---- a/storage/innodb_plugin/row/row0sel.c	2010-07-20 16:33:04.204866103 +0900
-+++ b/storage/innodb_plugin/row/row0sel.c	2010-07-20 16:33:53.998864025 +0900
+--- a/storage/innodb_plugin/row/row0sel.c
++++ b/storage/innodb_plugin/row/row0sel.c
 @@ -3374,6 +3374,7 @@
  	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
  	ulint*		offsets				= offsets_;
@@ -1132,9 +1116,8 @@
  			trx_print(stderr, trx, 600);
  			fputc('\n', stderr);
  			ut_error;
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2011-02-21 20:31:57.900982316 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2011-02-21 20:32:39.549912950 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -418,6 +418,8 @@
  
  UNIV_INTERN ulint	srv_extra_rsegments = 0; /* extra rseg for users */
@@ -1144,9 +1127,8 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-04-30 16:37:05.000000000 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-04-30 16:41:46.000000000 +0900
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -2012,7 +2012,7 @@
  	if (srv_print_verbose_log) {
  		ut_print_timestamp(stderr);
@@ -1156,9 +1138,8 @@
  			"log sequence number %llu\n",
  			INNODB_VERSION_STR, srv_start_lsn);
  	}
-diff -ruN a/storage/innodb_plugin/sync/sync0sync.c b/storage/innodb_plugin/sync/sync0sync.c
---- a/storage/innodb_plugin/sync/sync0sync.c	2011-02-25 14:09:57.710270419 +0900
-+++ b/storage/innodb_plugin/sync/sync0sync.c	2011-02-25 14:12:20.138232965 +0900
+--- a/storage/innodb_plugin/sync/sync0sync.c
++++ b/storage/innodb_plugin/sync/sync0sync.c
 @@ -1161,6 +1161,7 @@
  	case SYNC_LOG:
  	case SYNC_THR_LOCAL:
@@ -1167,9 +1148,8 @@
  	case SYNC_TRX_SYS_HEADER:
  	case SYNC_FILE_FORMAT_TAG:
  	case SYNC_DOUBLEWRITE:
-diff -ruN a/storage/innodb_plugin/trx/trx0purge.c b/storage/innodb_plugin/trx/trx0purge.c
---- a/storage/innodb_plugin/trx/trx0purge.c	2010-07-21 14:52:46.538653893 +0900
-+++ b/storage/innodb_plugin/trx/trx0purge.c	2010-07-21 14:57:46.505530034 +0900
+--- a/storage/innodb_plugin/trx/trx0purge.c
++++ b/storage/innodb_plugin/trx/trx0purge.c
 @@ -1144,8 +1144,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 05:41:42 +0000
+++ patches/innodb_io_patches.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c
---- a/storage/innodb_plugin/buf/buf0flu.c	2011-04-12 16:11:36.000000000 +0400
-+++ b/storage/innodb_plugin/buf/buf0flu.c	2011-07-07 18:53:03.000000000 +0400
+--- a/storage/innodb_plugin/buf/buf0flu.c
++++ b/storage/innodb_plugin/buf/buf0flu.c
 @@ -741,7 +741,7 @@
  flush:
  	/* Now flush the doublewrite buffer data to disk */
@@ -46,9 +45,8 @@
  
  				buf_pool_mutex_enter();
  				goto flush_next;
-diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2011-04-12 16:11:41.000000000 +0400
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2011-07-07 18:53:03.000000000 +0400
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -254,6 +254,10 @@
  		= BUF_READ_AHEAD_LINEAR_AREA;
  	ulint		threshold;
@@ -60,9 +58,8 @@
  	if (UNIV_UNLIKELY(srv_startup_is_before_trx_rollback_phase)) {
  		/* No read-ahead to avoid thread deadlocks */
  		return(0);
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2011-07-07 18:01:43.000000000 +0400
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2011-07-07 18:52:59.000000000 +0400
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -2554,7 +2554,7 @@
  
  		os_thread_sleep(20000);
@@ -137,9 +134,8 @@
  	}
  
  	mem_free(space_ids);
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2011-07-07 18:01:43.000000000 +0400
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2011-07-07 18:53:02.000000000 +0400
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -332,6 +332,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);
@@ -320,9 +316,8 @@
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(change_buffering),
  #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2011-07-07 18:01:43.000000000 +0400
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2011-07-07 18:53:03.000000000 +0400
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -25,5 +25,6 @@
  }innodb_enhancements[] = {
  {"xtradb_show_enhancements","I_S.XTRADB_ENHANCEMENTS","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -330,9 +325,8 @@
 +{"innodb_io","Improvements to InnoDB IO","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/ibuf/ibuf0ibuf.c b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
---- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-04-12 16:11:39.000000000 +0400
-+++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c	2011-07-07 18:53:01.000000000 +0400
+--- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c
++++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c
 @@ -464,8 +464,10 @@
  	grow in size, as the references on the upper levels of the tree can
  	change */
@@ -360,9 +354,8 @@
  
  	sync = FALSE;
  
-diff -ruN a/storage/innodb_plugin/include/buf0rea.h b/storage/innodb_plugin/include/buf0rea.h
---- a/storage/innodb_plugin/include/buf0rea.h	2011-04-12 16:11:41.000000000 +0400
-+++ b/storage/innodb_plugin/include/buf0rea.h	2011-07-07 18:52:57.000000000 +0400
+--- a/storage/innodb_plugin/include/buf0rea.h
++++ b/storage/innodb_plugin/include/buf0rea.h
 @@ -124,8 +124,7 @@
  
  /** The size in pages of the area which the read-ahead algorithms read if
@@ -373,9 +366,8 @@
  
  /** @name Modes used in read-ahead @{ */
  /** read only pages belonging to the insert buffer tree */
-diff -ruN a/storage/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h
---- a/storage/innodb_plugin/include/fil0fil.h	2011-07-07 18:01:43.000000000 +0400
-+++ b/storage/innodb_plugin/include/fil0fil.h	2011-07-07 18:52:57.000000000 +0400
+--- a/storage/innodb_plugin/include/fil0fil.h
++++ b/storage/innodb_plugin/include/fil0fil.h
 @@ -657,8 +657,9 @@
  void
  fil_flush(
@@ -387,9 +379,8 @@
  /**********************************************************************//**
  Flushes to disk writes in file spaces of the given type possibly cached by
  the OS. */
-diff -ruN a/storage/innodb_plugin/include/ha_prototypes.h b/storage/innodb_plugin/include/ha_prototypes.h
---- a/storage/innodb_plugin/include/ha_prototypes.h	2011-04-12 16:11:41.000000000 +0400
-+++ b/storage/innodb_plugin/include/ha_prototypes.h	2011-07-07 18:01:44.000000000 +0400
+--- a/storage/innodb_plugin/include/ha_prototypes.h
++++ b/storage/innodb_plugin/include/ha_prototypes.h
 @@ -268,4 +268,12 @@
  	void*	thd);	/*!< in: thread handle (THD*), or NULL to query
  			the global innodb_lock_wait_timeout */
@@ -403,9 +394,8 @@
 +	void*	thd);
 +
  #endif
-diff -ruN a/storage/innodb_plugin/include/os0file.h b/storage/innodb_plugin/include/os0file.h
---- a/storage/innodb_plugin/include/os0file.h	2011-04-12 16:11:41.000000000 +0400
-+++ b/storage/innodb_plugin/include/os0file.h	2011-07-07 18:52:57.000000000 +0400
+--- a/storage/innodb_plugin/include/os0file.h
++++ b/storage/innodb_plugin/include/os0file.h
 @@ -466,7 +466,8 @@
  ibool
  os_file_flush(
@@ -416,9 +406,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/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2011-07-07 18:01:43.000000000 +0400
-+++ b/storage/innodb_plugin/include/srv0srv.h	2011-07-07 18:53:02.000000000 +0400
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -204,6 +204,16 @@
  extern ulong	srv_max_purge_lag;
  
@@ -447,9 +436,8 @@
  };
  
  /** Alternatives for file i/o in Windows */
-diff -ruN a/storage/innodb_plugin/include/trx0trx.h b/storage/innodb_plugin/include/trx0trx.h
---- a/storage/innodb_plugin/include/trx0trx.h	2011-04-12 16:11:39.000000000 +0400
-+++ b/storage/innodb_plugin/include/trx0trx.h	2011-07-07 18:53:01.000000000 +0400
+--- a/storage/innodb_plugin/include/trx0trx.h
++++ b/storage/innodb_plugin/include/trx0trx.h
 @@ -497,6 +497,7 @@
  					FALSE, one can save CPU time and about
  					150 bytes in the undo log size as then
@@ -458,9 +446,8 @@
  	ulint		flush_log_later;/* In 2PC, we hold the
  					prepare_commit mutex across
  					both phases. In that case, we
-diff -ruN a/storage/innodb_plugin/log/log0log.c b/storage/innodb_plugin/log/log0log.c
---- a/storage/innodb_plugin/log/log0log.c	2011-04-12 16:11:41.000000000 +0400
-+++ b/storage/innodb_plugin/log/log0log.c	2011-07-07 18:52:58.000000000 +0400
+--- a/storage/innodb_plugin/log/log0log.c
++++ b/storage/innodb_plugin/log/log0log.c
 @@ -347,6 +347,33 @@
  }
  
@@ -608,9 +595,8 @@
  	current_time = time(NULL);
  
  	time_elapsed = 0.001 + difftime(current_time,
-diff -ruN a/storage/innodb_plugin/log/log0recv.c b/storage/innodb_plugin/log/log0recv.c
---- a/storage/innodb_plugin/log/log0recv.c	2011-04-12 16:11:37.000000000 +0400
-+++ b/storage/innodb_plugin/log/log0recv.c	2011-07-07 18:52:58.000000000 +0400
+--- a/storage/innodb_plugin/log/log0recv.c
++++ b/storage/innodb_plugin/log/log0recv.c
 @@ -2893,9 +2893,12 @@
  	ib_uint64_t	archived_lsn;
  #endif /* UNIV_LOG_ARCHIVE */
@@ -643,9 +629,8 @@
  	os_file_close(log_file);
  
  	ut_free(buf);
-diff -ruN a/storage/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
---- a/storage/innodb_plugin/os/os0file.c	2011-04-12 16:11:34.000000000 +0400
-+++ b/storage/innodb_plugin/os/os0file.c	2011-07-07 18:52:58.000000000 +0400
+--- a/storage/innodb_plugin/os/os0file.c
++++ b/storage/innodb_plugin/os/os0file.c
 @@ -91,6 +91,28 @@
  /** Flag: enable debug printout for asynchronous i/o */
  UNIV_INTERN ibool	os_aio_print_debug	= FALSE;
@@ -1204,9 +1189,8 @@
  
  	*message1 = slot->message1;
  	*message2 = slot->message2;
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2011-07-07 18:01:43.000000000 +0400
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2011-07-07 18:53:02.000000000 +0400
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -375,6 +375,17 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
@@ -1605,9 +1589,8 @@
  	}
  
  	srv_main_thread_op_info = "reserving kernel mutex";
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2011-04-12 16:11:39.000000000 +0400
-+++ b/storage/innodb_plugin/srv/srv0start.c	2011-07-07 18:53:02.000000000 +0400
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -1141,7 +1141,12 @@
  		break;
  	default:
@@ -1645,9 +1628,8 @@
  #endif
  	} else {
  		fprintf(stderr,
-diff -ruN a/storage/innodb_plugin/trx/trx0trx.c b/storage/innodb_plugin/trx/trx0trx.c
---- a/storage/innodb_plugin/trx/trx0trx.c	2011-04-12 16:11:39.000000000 +0400
-+++ b/storage/innodb_plugin/trx/trx0trx.c	2011-07-07 18:53:01.000000000 +0400
+--- a/storage/innodb_plugin/trx/trx0trx.c
++++ b/storage/innodb_plugin/trx/trx0trx.c
 @@ -109,6 +109,8 @@
  
  	trx->support_xa = TRUE;

=== modified file 'patches/innodb_lru_dump_restore.patch'
--- patches/innodb_lru_dump_restore.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_lru_dump_restore.patch	2011-07-27 11:11:52 +0000
@@ -5,8 +5,8 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/innodb_plugin/r/percona_bug692211.result	2010-12-22 20:48:19.000000000 +0300
+--- /dev/null
++++ b/mysql-test/suite/innodb_plugin/r/percona_bug692211.result
 @@ -0,0 +1,7 @@
 +#
 +# LP bug #692211: innodb_auto_lru_dump crashes if ib_lru_dump doesn't 
@@ -15,12 +15,12 @@
 +SELECT @@innodb_auto_lru_dump;
 +@@innodb_auto_lru_dump
 +300
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211-master.opt	2010-12-22 20:25:59.000000000 +0300
+--- /dev/null
++++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211-master.opt
 @@ -0,0 +1 @@
 +--innodb_auto_lru_dump=300
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211.test	2010-12-22 20:17:57.000000000 +0300
+--- /dev/null
++++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211.test
 @@ -0,0 +1,17 @@
 +--source include/have_innodb_plugin.inc
 +
@@ -39,9 +39,8 @@
 +--let $MYSQLD_DATADIR= `SELECT @@datadir`
 +--error 1
 +--file_exists $MYSQLD_DATADIR/ib_lru_dump;
-diff -ruN a/storage/innodb_plugin/buf/buf0lru.c b/storage/innodb_plugin/buf/buf0lru.c
---- a/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 16:13:11.070058073 +0900
-+++ b/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 16:34:33.860400549 +0900
+--- a/storage/innodb_plugin/buf/buf0lru.c
++++ b/storage/innodb_plugin/buf/buf0lru.c
 @@ -2121,6 +2121,277 @@
  	memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
  }
@@ -320,9 +319,8 @@
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  /**********************************************************************//**
  Validates the LRU list.
-diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:32:40.293411717 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:34:33.863409016 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -56,7 +56,7 @@
  which case it is never read into the pool, or if the tablespace does
  not exist or is being dropped 
@@ -332,9 +330,8 @@
  ulint
  buf_read_page_low(
  /*==============*/
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:32:40.298411400 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:34:33.868058362 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -4917,6 +4917,70 @@
  	return(DB_SUCCESS);
  }
@@ -406,9 +403,8 @@
  #ifndef UNIV_HOTBACKUP
  /**********************************************************************//**
  Waits for an aio operation to complete. This function is used to write the
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-10-01 09:57:56.486228425 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-10-01 10:00:13.292228546 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11551,6 +11551,12 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
@@ -430,9 +426,8 @@
    MYSQL_SYSVAR(use_purge_thread),
    NULL
  };
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:29:12.540979608 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:34:33.873058189 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -46,6 +46,7 @@
  #include "trx0rseg.h" /* for trx_rseg_struct */
  #include "trx0sys.h" /* for trx_sys */
@@ -478,9 +473,8 @@
  
  	field_store_string(i_s_table->field[0],
  		"Undefined XTRA_* command.");
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:32:40.313021803 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:34:33.871059345 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -41,5 +41,6 @@
  {"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -488,9 +482,8 @@
 +{"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/buf0lru.h b/storage/innodb_plugin/include/buf0lru.h
---- a/storage/innodb_plugin/include/buf0lru.h	2010-08-27 16:13:11.085978393 +0900
-+++ b/storage/innodb_plugin/include/buf0lru.h	2010-08-27 16:34:33.875100517 +0900
+--- a/storage/innodb_plugin/include/buf0lru.h
++++ b/storage/innodb_plugin/include/buf0lru.h
 @@ -209,6 +209,18 @@
  void
  buf_LRU_stat_update(void);
@@ -510,9 +503,8 @@
  
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  /**********************************************************************//**
-diff -ruN a/storage/innodb_plugin/include/buf0rea.h b/storage/innodb_plugin/include/buf0rea.h
---- a/storage/innodb_plugin/include/buf0rea.h	2010-08-27 16:32:40.314021595 +0900
-+++ b/storage/innodb_plugin/include/buf0rea.h	2010-08-27 16:34:33.877059445 +0900
+--- a/storage/innodb_plugin/include/buf0rea.h
++++ b/storage/innodb_plugin/include/buf0rea.h
 @@ -31,6 +31,37 @@
  #include "buf0types.h"
  
@@ -551,9 +543,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/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h
---- a/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:32:40.315012507 +0900
-+++ b/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:34:33.878063455 +0900
+--- a/storage/innodb_plugin/include/fil0fil.h
++++ b/storage/innodb_plugin/include/fil0fil.h
 @@ -643,6 +643,14 @@
  	void*	message,	/*!< in: message for aio handler if non-sync
  				aio used, else ignored */
@@ -569,9 +560,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/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-10-01 09:57:56.500228711 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-10-01 10:00:13.302223409 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -335,6 +335,9 @@
  reading of a disk page */
  extern ulint srv_buf_pool_reads;
@@ -599,9 +589,8 @@
  /******************************************************************//**
  Outputs to a file the output of the InnoDB Monitor.
  @return FALSE if not all information printed
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-10-01 09:57:56.516255101 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-10-01 10:00:13.304230973 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -303,6 +303,9 @@
  reading of a disk page */
  UNIV_INTERN ulint srv_buf_pool_reads = 0;
@@ -612,15 +601,10 @@
  /* structure to pass status variables to MySQL */
  UNIV_INTERN export_struc export_vars;
  
-@@ -2550,6 +2553,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. */
+@@ -2555,6 +2558,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.
@@ -666,12 +650,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/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-10-01 09:57:56.420229366 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-10-01 10:00:13.309260428 +0900
++	os_thread_exit(NULL);
++
++	OS_THREAD_DUMMY_RETURN;
++}
++
+ /*******************************************************************//**
+ Tells the InnoDB server that there has been activity in the database
+ and wakes up the master thread if it is suspended (not sleeping). Used
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -126,9 +126,9 @@
  static ulint		ios;
  

=== modified file 'patches/innodb_opt_lru_count.patch'
--- patches/innodb_opt_lru_count.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_opt_lru_count.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buddy.c b/storage/innodb_plugin/buf/buf0buddy.c
---- a/storage/innodb_plugin/buf/buf0buddy.c	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/buf/buf0buddy.c	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/buf/buf0buddy.c
++++ b/storage/innodb_plugin/buf/buf0buddy.c
 @@ -143,7 +143,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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-04-29 15:44:28.000000000 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -669,9 +669,9 @@
  	block->page.in_zip_hash = FALSE;
  	block->page.in_flush_list = FALSE;
@@ -77,9 +75,8 @@
  
  	return(ratio);
  }
-diff -ruN a/storage/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c
---- a/storage/innodb_plugin/buf/buf0flu.c	2010-04-29 15:55:25.000000000 +0900
-+++ b/storage/innodb_plugin/buf/buf0flu.c	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/buf/buf0flu.c
++++ b/storage/innodb_plugin/buf/buf0flu.c
 @@ -351,17 +351,19 @@
  	buf_page_t*	bpage)	/*!< in: buffer control block, must be
  				buf_page_in_file(bpage) and in the LRU list */
@@ -183,9 +180,8 @@
  			/* There was an LRU type flush batch already running;
  			let us wait for it to end */
  
-diff -ruN a/storage/innodb_plugin/buf/buf0lru.c b/storage/innodb_plugin/buf/buf0lru.c
---- a/storage/innodb_plugin/buf/buf0lru.c	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/buf/buf0lru.c	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/buf/buf0lru.c
++++ b/storage/innodb_plugin/buf/buf0lru.c
 @@ -936,7 +936,7 @@
  
  	/* No free block was found: try to flush the LRU list */
@@ -231,9 +227,8 @@
  				buf_LRU_add_block_low(b, buf_page_is_old(b));
  			}
  
-diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-04-29 15:55:25.000000000 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -195,7 +195,7 @@
  	}
  
@@ -270,9 +265,8 @@
  
  #ifdef UNIV_DEBUG
  	if (buf_debug_prints) {
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 15:55:25.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -26,5 +26,6 @@
  {"xtradb_show_enhancements","I_S.XTRADB_ENHANCEMENTS","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_show_status","Improvements to SHOW INNODB STATUS","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -280,9 +274,8 @@
 +{"innodb_opt_lru_count","Fix of buffer_pool mutex","Decreases contention on buffer_pool mutex on LRU operations","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
---- a/storage/innodb_plugin/include/buf0buf.h	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.h	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
 @@ -1118,11 +1118,11 @@
  
  	UT_LIST_NODE_T(buf_page_t) LRU;
@@ -297,9 +290,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/innodb_plugin/include/buf0flu.h b/storage/innodb_plugin/include/buf0flu.h
---- a/storage/innodb_plugin/include/buf0flu.h	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0flu.h	2010-04-29 15:55:42.000000000 +0900
+--- a/storage/innodb_plugin/include/buf0flu.h
++++ b/storage/innodb_plugin/include/buf0flu.h
 @@ -61,8 +61,9 @@
  a margin of replaceable pages there. */
  UNIV_INTERN

=== modified file 'patches/innodb_overwrite_relay_log_info.patch'
--- patches/innodb_overwrite_relay_log_info.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_overwrite_relay_log_info.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:39:34.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:42:07.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -43,7 +43,17 @@
  #pragma implementation				// gcc: Class implementation
  #endif
@@ -264,9 +263,8 @@
    MYSQL_SYSVAR(rollback_on_timeout),
    MYSQL_SYSVAR(stats_on_metadata),
    MYSQL_SYSVAR(stats_sample_pages),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:39:34.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:42:07.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -30,5 +30,6 @@
  {"innodb_buffer_pool_pages","Information of buffer pool content","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_expand_undo_slots","expandable maximum number of undo slots","from 1024 (default) to about 4000","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -274,9 +272,8 @@
 +{"innodb_overwrite_relay_log_info","overwrite relay-log.info when slave recovery","Building as plugin, it is not used.","http://www.percona.com/docs/wiki/percona-xtradb:innodb_overwrite_relay_log_info"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/trx0sys.h b/storage/innodb_plugin/include/trx0sys.h
---- a/storage/innodb_plugin/include/trx0sys.h	2010-04-29 16:39:34.000000000 +0900
-+++ b/storage/innodb_plugin/include/trx0sys.h	2010-04-29 16:42:07.000000000 +0900
+--- a/storage/innodb_plugin/include/trx0sys.h
++++ b/storage/innodb_plugin/include/trx0sys.h
 @@ -52,6 +52,9 @@
  extern ib_int64_t	trx_sys_mysql_master_log_pos;
  /* @} */
@@ -313,9 +310,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/innodb_plugin/include/trx0trx.h b/storage/innodb_plugin/include/trx0trx.h
---- a/storage/innodb_plugin/include/trx0trx.h	2010-04-06 23:07:13.000000000 +0900
-+++ b/storage/innodb_plugin/include/trx0trx.h	2010-04-29 16:42:07.000000000 +0900
+--- a/storage/innodb_plugin/include/trx0trx.h
++++ b/storage/innodb_plugin/include/trx0trx.h
 @@ -569,6 +569,21 @@
  	ib_int64_t	mysql_log_offset;/* if MySQL binlog is used, this field
  					contains the end offset of the binlog
@@ -338,9 +334,8 @@
  	os_thread_id_t	mysql_thread_id;/* id of the MySQL thread associated
  					with this transaction object */
  	ulint		mysql_process_no;/* since in Linux, 'top' reports
-diff -ruN a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
---- a/storage/innodb_plugin/trx/trx0sys.c	2010-04-29 16:39:34.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0sys.c	2010-04-29 16:42:07.000000000 +0900
+--- a/storage/innodb_plugin/trx/trx0sys.c
++++ b/storage/innodb_plugin/trx/trx0sys.c
 @@ -74,13 +74,16 @@
  file name and position here. */
  /* @{ */
@@ -439,9 +434,8 @@
  	mtr_commit(&mtr);
  }
  
-diff -ruN a/storage/innodb_plugin/trx/trx0trx.c b/storage/innodb_plugin/trx/trx0trx.c
---- a/storage/innodb_plugin/trx/trx0trx.c	2010-04-06 23:07:14.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0trx.c	2010-04-29 16:42:07.000000000 +0900
+--- a/storage/innodb_plugin/trx/trx0trx.c
++++ b/storage/innodb_plugin/trx/trx0trx.c
 @@ -129,6 +129,10 @@
  
  	trx->mysql_log_file_name = NULL;

=== modified file 'patches/innodb_pass_corrupt_table.patch'
--- patches/innodb_pass_corrupt_table.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_pass_corrupt_table.patch	2011-07-27 11:11:52 +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/innodb_plugin/btr/btr0btr.c b/storage/innodb_plugin/btr/btr0btr.c
---- a/storage/innodb_plugin/btr/btr0btr.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/btr/btr0btr.c	2010-08-27 16:39:02.932248156 +0900
+--- a/storage/innodb_plugin/btr/btr0btr.c
++++ b/storage/innodb_plugin/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/innodb_plugin/btr/btr0cur.c b/storage/innodb_plugin/btr/btr0cur.c
---- a/storage/innodb_plugin/btr/btr0cur.c	2010-08-27 16:22:04.211409467 +0900
-+++ b/storage/innodb_plugin/btr/btr0cur.c	2010-08-27 16:39:02.934087429 +0900
+--- a/storage/innodb_plugin/btr/btr0cur.c
++++ b/storage/innodb_plugin/btr/btr0cur.c
 @@ -239,6 +239,11 @@
  	case BTR_MODIFY_LEAF:
  		mode = latch_mode == BTR_SEARCH_LEAF ? RW_S_LATCH : RW_X_LATCH;
@@ -252,9 +250,8 @@
  		rec = page_rec_get_next(page_get_infimum_rec(page));
  
  		if (!page_rec_is_supremum(rec)) {
-diff -ruN a/storage/innodb_plugin/btr/btr0pcur.c b/storage/innodb_plugin/btr/btr0pcur.c
---- a/storage/innodb_plugin/btr/btr0pcur.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/btr/btr0pcur.c	2010-08-27 16:39:02.936071298 +0900
+--- a/storage/innodb_plugin/btr/btr0pcur.c
++++ b/storage/innodb_plugin/btr/btr0pcur.c
 @@ -32,7 +32,7 @@
  #include "ut0byte.h"
  #include "rem0cmp.h"
@@ -293,9 +290,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/innodb_plugin/btr/btr0sea.c b/storage/innodb_plugin/btr/btr0sea.c
---- a/storage/innodb_plugin/btr/btr0sea.c	2010-08-27 16:13:11.051989872 +0900
-+++ b/storage/innodb_plugin/btr/btr0sea.c	2010-08-27 16:39:02.937071716 +0900
+--- a/storage/innodb_plugin/btr/btr0sea.c
++++ b/storage/innodb_plugin/btr/btr0sea.c
 @@ -42,7 +42,7 @@
  #include "btr0pcur.h"
  #include "btr0btr.h"
@@ -317,9 +313,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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:38:38.224976846 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:39:02.939057262 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -52,6 +52,7 @@
  #include "log0recv.h"
  #include "page0zip.h"
@@ -436,9 +431,8 @@
  				TRUE);
  		}
  	}
-diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:38:38.228017562 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:39:02.941056860 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -189,12 +189,19 @@
  			      sync, space, 0, offset, 0, UNIV_PAGE_SIZE,
  			      ((buf_block_t*) bpage)->frame, bpage, trx);
@@ -460,9 +454,8 @@
  	}
  
  	return(1);
-diff -ruN a/storage/innodb_plugin/dict/dict0dict.c b/storage/innodb_plugin/dict/dict0dict.c
---- a/storage/innodb_plugin/dict/dict0dict.c	2010-08-27 16:22:04.220021017 +0900
-+++ b/storage/innodb_plugin/dict/dict0dict.c	2010-08-27 16:39:02.943057100 +0900
+--- a/storage/innodb_plugin/dict/dict0dict.c
++++ b/storage/innodb_plugin/dict/dict0dict.c
 @@ -54,6 +54,7 @@
  #include "row0merge.h"
  #include "m_ctype.h" /* my_isspace() */
@@ -544,9 +537,8 @@
 +	}
 +}
  #endif /* !UNIV_HOTBACKUP */
-diff -ruN a/storage/innodb_plugin/dict/dict0mem.c b/storage/innodb_plugin/dict/dict0mem.c
---- a/storage/innodb_plugin/dict/dict0mem.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/dict/dict0mem.c	2010-08-27 16:39:02.945072825 +0900
+--- a/storage/innodb_plugin/dict/dict0mem.c
++++ b/storage/innodb_plugin/dict/dict0mem.c
 @@ -89,6 +89,8 @@
  	/* The number of transactions that are either waiting on the
  	AUTOINC lock or have been granted the lock. */
@@ -556,9 +548,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  	ut_d(table->magic_n = DICT_TABLE_MAGIC_N);
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:38:38.234979673 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:39:02.947021155 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -223,6 +223,7 @@
  				file we have written to */
  	ibool		is_in_unflushed_spaces; /*!< TRUE if this space is
@@ -664,9 +655,8 @@
 +	mutex_exit(&fil_system->mutex);
 +}
 +
-diff -ruN a/storage/innodb_plugin/fsp/fsp0fsp.c b/storage/innodb_plugin/fsp/fsp0fsp.c
---- a/storage/innodb_plugin/fsp/fsp0fsp.c	2010-08-27 16:38:38.240058836 +0900
-+++ b/storage/innodb_plugin/fsp/fsp0fsp.c	2010-08-27 16:39:02.950021363 +0900
+--- a/storage/innodb_plugin/fsp/fsp0fsp.c
++++ b/storage/innodb_plugin/fsp/fsp0fsp.c
 @@ -370,6 +370,12 @@
  	ut_ad(id || !zip_size);
  
@@ -775,9 +765,8 @@
  	descr = fseg_get_first_extent(inode, space, zip_size, mtr);
  
  	if (descr != NULL) {
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:38:38.249059616 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:39:02.960021471 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -3735,6 +3735,12 @@
  		DBUG_RETURN(1);
  	}
@@ -1044,9 +1033,8 @@
    NULL
  };
  
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.h b/storage/innodb_plugin/handler/ha_innodb.h
---- a/storage/innodb_plugin/handler/ha_innodb.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.h	2010-08-27 16:39:03.003058548 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.h
++++ b/storage/innodb_plugin/handler/ha_innodb.h
 @@ -52,6 +52,7 @@
  	innodb_idx_translate_t	idx_trans_tbl;	/*!< index translation
  						table between MySQL and
@@ -1063,9 +1051,8 @@
  
  	int write_row(uchar * buf);
  	int update_row(const uchar * old_data, uchar * new_data);
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:38:38.272105535 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:39:03.003990202 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -43,5 +43,6 @@
  {"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -1073,9 +1060,8 @@
 +{"innodb_pass_corrupt_table","Treat tables as corrupt instead of crash, when meet corrupt blocks","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/btr0btr.ic b/storage/innodb_plugin/include/btr0btr.ic
---- a/storage/innodb_plugin/include/btr0btr.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/btr0btr.ic	2010-08-27 16:39:03.004990818 +0900
+--- a/storage/innodb_plugin/include/btr0btr.ic
++++ b/storage/innodb_plugin/include/btr0btr.ic
 @@ -28,7 +28,7 @@
  #include "mtr0mtr.h"
  #include "mtr0log.h"
@@ -1096,9 +1082,8 @@
  
  		buf_block_dbg_add_level(block, SYNC_TREE_NODE);
  	}
-diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
---- a/storage/innodb_plugin/include/buf0buf.h	2010-08-27 16:13:11.081058676 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.h	2010-08-27 16:39:03.007006842 +0900
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
 @@ -850,7 +850,7 @@
  	const buf_block_t*	block)	/*!< in: pointer to the control block */
  	__attribute__((pure));
@@ -1126,9 +1111,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/innodb_plugin/include/buf0buf.ic b/storage/innodb_plugin/include/buf0buf.ic
---- a/storage/innodb_plugin/include/buf0buf.ic	2010-08-27 16:13:11.082973631 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.ic	2010-08-27 16:39:03.009020919 +0900
+--- a/storage/innodb_plugin/include/buf0buf.ic
++++ b/storage/innodb_plugin/include/buf0buf.ic
 @@ -35,7 +35,7 @@
  #include "buf0flu.h"
  #include "buf0lru.h"
@@ -1151,9 +1135,8 @@
  	ut_ad(block);
  
  	switch (buf_block_get_state(block)) {
-diff -ruN a/storage/innodb_plugin/include/dict0dict.h b/storage/innodb_plugin/include/dict0dict.h
---- a/storage/innodb_plugin/include/dict0dict.h	2010-08-27 16:22:04.264988090 +0900
-+++ b/storage/innodb_plugin/include/dict0dict.h	2010-08-27 16:39:03.011025333 +0900
+--- a/storage/innodb_plugin/include/dict0dict.h
++++ b/storage/innodb_plugin/include/dict0dict.h
 @@ -1206,6 +1206,15 @@
  dict_close(void);
  /*============*/
@@ -1170,9 +1153,8 @@
  #ifndef UNIV_NONINL
  #include "dict0dict.ic"
  #endif
-diff -ruN a/storage/innodb_plugin/include/dict0mem.h b/storage/innodb_plugin/include/dict0mem.h
---- a/storage/innodb_plugin/include/dict0mem.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/dict0mem.h	2010-08-27 16:39:03.013021149 +0900
+--- a/storage/innodb_plugin/include/dict0mem.h
++++ b/storage/innodb_plugin/include/dict0mem.h
 @@ -573,6 +573,7 @@
  				the AUTOINC lock on this table. */
  				/* @} */
@@ -1181,9 +1163,8 @@
  #endif /* !UNIV_HOTBACKUP */
  
  #ifdef UNIV_DEBUG
-diff -ruN a/storage/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h
---- a/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:36:03.499987483 +0900
-+++ b/storage/innodb_plugin/include/fil0fil.h	2010-08-27 16:39:03.015021314 +0900
+--- a/storage/innodb_plugin/include/fil0fil.h
++++ b/storage/innodb_plugin/include/fil0fil.h
 @@ -749,6 +749,19 @@
  fil_system_hash_nodes(void);
  /*========================*/
@@ -1204,9 +1185,8 @@
  typedef	struct fil_space_struct	fil_space_t;
  
  #endif
-diff -ruN a/storage/innodb_plugin/include/fut0fut.ic b/storage/innodb_plugin/include/fut0fut.ic
---- a/storage/innodb_plugin/include/fut0fut.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/fut0fut.ic	2010-08-27 16:39:03.015990218 +0900
+--- a/storage/innodb_plugin/include/fut0fut.ic
++++ b/storage/innodb_plugin/include/fut0fut.ic
 @@ -23,6 +23,7 @@
  Created 12/13/1995 Heikki Tuuri
  ***********************************************************************/
@@ -1228,9 +1208,8 @@
  	ptr = buf_block_get_frame(block) + addr.boffset;
  
  	buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
-diff -ruN a/storage/innodb_plugin/include/page0page.h b/storage/innodb_plugin/include/page0page.h
---- a/storage/innodb_plugin/include/page0page.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/page0page.h	2010-08-27 16:39:03.025058694 +0900
+--- a/storage/innodb_plugin/include/page0page.h
++++ b/storage/innodb_plugin/include/page0page.h
 @@ -500,7 +500,7 @@
  page_is_leaf(
  /*=========*/
@@ -1240,9 +1219,8 @@
  /************************************************************//**
  Gets the pointer to the next record on the page.
  @return	pointer to next record */
-diff -ruN a/storage/innodb_plugin/include/page0page.ic b/storage/innodb_plugin/include/page0page.ic
---- a/storage/innodb_plugin/include/page0page.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/page0page.ic	2010-08-27 16:39:03.027021276 +0900
+--- a/storage/innodb_plugin/include/page0page.ic
++++ b/storage/innodb_plugin/include/page0page.ic
 @@ -275,6 +275,9 @@
  /*=========*/
  	const page_t*	page)	/*!< in: page */
@@ -1253,9 +1231,8 @@
  	return(!*(const uint16*) (page + (PAGE_HEADER + PAGE_LEVEL)));
  }
  
-diff -ruN a/storage/innodb_plugin/include/page0zip.h b/storage/innodb_plugin/include/page0zip.h
---- a/storage/innodb_plugin/include/page0zip.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/page0zip.h	2010-08-27 16:39:03.027992946 +0900
+--- a/storage/innodb_plugin/include/page0zip.h
++++ b/storage/innodb_plugin/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 */
@@ -1265,9 +1242,8 @@
  
  /**********************************************************************//**
  Decompress a page.  This function should tolerate errors on the compressed
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:38:38.275010935 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:39:03.030004790 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -231,6 +231,7 @@
  extern ulint	srv_adaptive_checkpoint;
  
@@ -1276,9 +1252,8 @@
  
  extern ulint	srv_extra_rsegments;
  extern ulint	srv_dict_size_limit;
-diff -ruN a/storage/innodb_plugin/page/page0zip.c b/storage/innodb_plugin/page/page0zip.c
---- a/storage/innodb_plugin/page/page0zip.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/page/page0zip.c	2010-08-27 16:39:03.033021517 +0900
+--- a/storage/innodb_plugin/page/page0zip.c
++++ b/storage/innodb_plugin/page/page0zip.c
 @@ -1153,6 +1153,10 @@
  	FILE*		logfile = NULL;
  #endif
@@ -1290,9 +1265,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/innodb_plugin/row/row0ins.c b/storage/innodb_plugin/row/row0ins.c
---- a/storage/innodb_plugin/row/row0ins.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/row/row0ins.c	2010-08-27 16:39:03.037022066 +0900
+--- a/storage/innodb_plugin/row/row0ins.c
++++ b/storage/innodb_plugin/row/row0ins.c
 @@ -1348,6 +1348,12 @@
  		const rec_t*		rec = btr_pcur_get_rec(&pcur);
  		const buf_block_t*	block = btr_pcur_get_block(&pcur);
@@ -1306,9 +1280,8 @@
  		if (page_rec_is_infimum(rec)) {
  
  			continue;
-diff -ruN a/storage/innodb_plugin/row/row0merge.c b/storage/innodb_plugin/row/row0merge.c
---- a/storage/innodb_plugin/row/row0merge.c	2010-08-27 16:22:04.282058645 +0900
-+++ b/storage/innodb_plugin/row/row0merge.c	2010-08-27 16:39:03.040985277 +0900
+--- a/storage/innodb_plugin/row/row0merge.c
++++ b/storage/innodb_plugin/row/row0merge.c
 @@ -1224,6 +1224,13 @@
  
  		if (UNIV_LIKELY(has_next)) {
@@ -1323,9 +1296,8 @@
  			offsets = rec_get_offsets(rec, clust_index, NULL,
  						  ULINT_UNDEFINED, &row_heap);
  
-diff -ruN a/storage/innodb_plugin/row/row0sel.c b/storage/innodb_plugin/row/row0sel.c
---- a/storage/innodb_plugin/row/row0sel.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/row/row0sel.c	2010-08-27 16:39:03.045021567 +0900
+--- a/storage/innodb_plugin/row/row0sel.c
++++ b/storage/innodb_plugin/row/row0sel.c
 @@ -3856,6 +3856,13 @@
  	/* PHASE 4: Look for matching records in a loop */
  
@@ -1340,9 +1312,8 @@
  	ut_ad(!!page_rec_is_comp(rec) == comp);
  #ifdef UNIV_SEARCH_DEBUG
  	/*
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:38:38.286989546 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:39:03.048990992 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -406,6 +406,7 @@
  UNIV_INTERN ulint	srv_adaptive_checkpoint = 0; /* 0: none  1: reflex  2: estimate */
  
@@ -1351,9 +1322,8 @@
  
  UNIV_INTERN ulint	srv_extra_rsegments = 0; /* extra rseg for users */
  UNIV_INTERN ulint	srv_dict_size_limit = 0;
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:38:38.290021700 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:39:03.052021423 +0900
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -2000,6 +2000,13 @@
  
  	os_fast_mutex_free(&srv_os_test_mutex);

=== modified file 'patches/innodb_purge_thread.patch'
--- patches/innodb_purge_thread.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_purge_thread.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:23:31.022060427 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:25:49.004020662 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11064,6 +11064,11 @@
    "Output statistics of recovery process after it.",
    NULL, NULL, FALSE);
@@ -28,9 +27,8 @@
    NULL
  };
  
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:23:31.027058629 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:25:49.004020662 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -37,5 +37,6 @@
  {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -38,9 +36,8 @@
 +{"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:23:31.030059162 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:25:49.005987844 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -116,6 +116,8 @@
  
  extern ibool	srv_recovery_stats;
@@ -81,9 +78,8 @@
  /*******************************************************************//**
  Tells the Innobase server that there has been activity in the database
  and wakes up the master thread if it is suspended (not sleeping). Used
-diff -ruN a/storage/innodb_plugin/include/trx0purge.h b/storage/innodb_plugin/include/trx0purge.h
---- a/storage/innodb_plugin/include/trx0purge.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/trx0purge.h	2010-08-27 16:25:49.006988119 +0900
+--- a/storage/innodb_plugin/include/trx0purge.h
++++ b/storage/innodb_plugin/include/trx0purge.h
 @@ -114,6 +114,25 @@
  ulint
  trx_purge(void);
@@ -122,9 +118,8 @@
  	rw_lock_t	latch;		/*!< The latch protecting the purge view.
  					A purge operation must acquire an
  					x-latch here for the instant at which
-diff -ruN a/storage/innodb_plugin/log/log0log.c b/storage/innodb_plugin/log/log0log.c
---- a/storage/innodb_plugin/log/log0log.c	2010-08-27 15:54:18.086987682 +0900
-+++ b/storage/innodb_plugin/log/log0log.c	2010-08-27 16:25:49.010020843 +0900
+--- a/storage/innodb_plugin/log/log0log.c
++++ b/storage/innodb_plugin/log/log0log.c
 @@ -3150,6 +3150,16 @@
  		goto loop;
  	}
@@ -142,9 +137,8 @@
  	mutex_exit(&kernel_mutex);
  
  	mutex_enter(&(log_sys->mutex));
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:23:31.042058997 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:25:49.014058600 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -146,6 +146,8 @@
  
  UNIV_INTERN ibool	srv_recovery_stats = FALSE;
@@ -342,9 +336,8 @@
 +
 +	OS_THREAD_DUMMY_RETURN;
 +}
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-08-27 15:59:21.760987922 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:25:49.017058492 +0900
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -126,9 +126,9 @@
  static ulint		ios;
  
@@ -378,9 +371,8 @@
  #ifdef UNIV_DEBUG
  	/* buf_debug_prints = TRUE; */
  #endif /* UNIV_DEBUG */
-diff -ruN a/storage/innodb_plugin/trx/trx0purge.c b/storage/innodb_plugin/trx/trx0purge.c
---- a/storage/innodb_plugin/trx/trx0purge.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0purge.c	2010-08-27 16:25:49.020058576 +0900
+--- a/storage/innodb_plugin/trx/trx0purge.c
++++ b/storage/innodb_plugin/trx/trx0purge.c
 @@ -184,8 +184,9 @@
  @return	own: the query graph */
  static

=== modified file 'patches/innodb_recovery_patches.patch'
--- patches/innodb_recovery_patches.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_recovery_patches.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-04-29 18:58:20.000000000 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -120,6 +120,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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 10:49:58.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -185,6 +185,8 @@
  static my_bool	innobase_use_doublewrite		= TRUE;
  static my_bool	innobase_use_checksums			= TRUE;
@@ -153,9 +151,8 @@
    MYSQL_SYSVAR(fast_shutdown),
    MYSQL_SYSVAR(file_io_threads),
    MYSQL_SYSVAR(read_io_threads),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-30 10:49:58.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -36,5 +36,6 @@
  {"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -163,9 +160,8 @@
 +{"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/log0recv.h b/storage/innodb_plugin/include/log0recv.h
---- a/storage/innodb_plugin/include/log0recv.h	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/include/log0recv.h	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/include/log0recv.h
++++ b/storage/innodb_plugin/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
@@ -206,9 +202,8 @@
  };
  
  /** The recovery system */
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-04-30 10:49:58.000000000 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -114,6 +114,8 @@
  
  extern ibool	srv_extra_undoslots;
@@ -218,9 +213,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/innodb_plugin/log/log0recv.c b/storage/innodb_plugin/log/log0recv.c
---- a/storage/innodb_plugin/log/log0recv.c	2010-04-06 23:07:13.000000000 +0900
-+++ b/storage/innodb_plugin/log/log0recv.c	2010-04-30 14:00:27.000000000 +0900
+--- a/storage/innodb_plugin/log/log0recv.c
++++ b/storage/innodb_plugin/log/log0recv.c
 @@ -179,6 +179,9 @@
  
  	recv_sys->heap = NULL;
@@ -440,9 +434,8 @@
  	if (recv_needed_recovery) {
  		trx_sys_print_mysql_master_log_pos();
  		trx_sys_print_mysql_binlog_offset();
-diff -ruN a/storage/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
---- a/storage/innodb_plugin/os/os0file.c	2010-04-29 15:55:25.000000000 +0900
-+++ b/storage/innodb_plugin/os/os0file.c	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/os/os0file.c
++++ b/storage/innodb_plugin/os/os0file.c
 @@ -38,6 +38,7 @@
  #include "srv0start.h"
  #include "fil0fil.h"
@@ -451,7 +444,7 @@
  #ifndef UNIV_HOTBACKUP
  # include "os0sync.h"
  # include "os0thread.h"
-@@ -4234,6 +4235,18 @@
+@@ -4235,6 +4236,18 @@
  		}
  	}
  
@@ -470,9 +463,8 @@
  	os_mutex_enter(array->mutex);
  
  	/* Mark the i/os done in slots */
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-04-30 10:49:58.000000000 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -144,6 +144,8 @@
  
  UNIV_INTERN ibool	srv_extra_undoslots = FALSE;
@@ -482,9 +474,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/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
---- a/storage/innodb_plugin/trx/trx0sys.c	2010-04-29 16:43:16.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0sys.c	2010-04-30 13:53:47.000000000 +0900
+--- a/storage/innodb_plugin/trx/trx0sys.c
++++ b/storage/innodb_plugin/trx/trx0sys.c
 @@ -39,6 +39,7 @@
  #include "srv0srv.h"
  #include "trx0purge.h"

=== modified file 'patches/innodb_separate_doublewrite.patch'
--- patches/innodb_separate_doublewrite.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_separate_doublewrite.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:32:40.292412102 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:37:55.358105738 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -3454,7 +3454,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/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c
---- a/storage/innodb_plugin/buf/buf0flu.c	2010-08-27 16:13:11.065058523 +0900
-+++ b/storage/innodb_plugin/buf/buf0flu.c	2010-08-27 16:37:55.359251796 +0900
+--- a/storage/innodb_plugin/buf/buf0flu.c
++++ b/storage/innodb_plugin/buf/buf0flu.c
 @@ -693,7 +693,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/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:36:03.492105076 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:37:55.361249702 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -86,7 +86,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/innodb_plugin/dict/dict0load.c b/storage/innodb_plugin/dict/dict0load.c
---- a/storage/innodb_plugin/dict/dict0load.c	2010-08-27 16:22:04.223059346 +0900
-+++ b/storage/innodb_plugin/dict/dict0load.c	2010-08-27 16:37:55.363104692 +0900
+--- a/storage/innodb_plugin/dict/dict0load.c
++++ b/storage/innodb_plugin/dict/dict0load.c
 @@ -40,6 +40,7 @@
  #include "rem0cmp.h"
  #include "srv0start.h"
@@ -102,9 +98,8 @@
  		/* The system tablespace is always available. */
  	} else if (!fil_space_for_table_exists_in_mem(
  			   space, name,
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:36:03.494411641 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-08-27 16:37:55.367990277 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -617,7 +617,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/innodb_plugin/fsp/fsp0fsp.c b/storage/innodb_plugin/fsp/fsp0fsp.c
---- a/storage/innodb_plugin/fsp/fsp0fsp.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/fsp/fsp0fsp.c	2010-08-27 16:37:55.372989956 +0900
+--- a/storage/innodb_plugin/fsp/fsp0fsp.c
++++ b/storage/innodb_plugin/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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:32:40.307988438 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:37:55.381993155 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -166,6 +166,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(extra_undoslots),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:36:03.497990333 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:37:55.401058721 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -42,5 +42,6 @@
  {"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -387,9 +379,8 @@
 +{"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/mtr0log.ic b/storage/innodb_plugin/include/mtr0log.ic
---- a/storage/innodb_plugin/include/mtr0log.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/mtr0log.ic	2010-08-27 16:37:55.401990156 +0900
+--- a/storage/innodb_plugin/include/mtr0log.ic
++++ b/storage/innodb_plugin/include/mtr0log.ic
 @@ -27,8 +27,8 @@
  #include "ut0lst.h"
  #include "buf0buf.h"
@@ -410,9 +401,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/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:32:40.319059202 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:37:55.403989968 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -115,6 +115,8 @@
  extern ulint*	srv_data_file_sizes;
  extern ulint*	srv_data_file_is_raw_partition;
@@ -422,9 +412,8 @@
  extern ibool	srv_extra_undoslots;
  
  extern ibool	srv_recovery_stats;
-diff -ruN a/storage/innodb_plugin/include/srv0start.h b/storage/innodb_plugin/include/srv0start.h
---- a/storage/innodb_plugin/include/srv0start.h	2010-11-03 22:39:54.000000000 +0900
-+++ b/storage/innodb_plugin/include/srv0start.h	2010-12-08 16:16:32.858488565 +0900
+--- a/storage/innodb_plugin/include/srv0start.h
++++ b/storage/innodb_plugin/include/srv0start.h
 @@ -131,4 +131,7 @@
  /** Log 'spaces' have id's >= this */
  #define SRV_LOG_SPACE_FIRST_ID		0xFFFFFFF0UL
@@ -433,9 +422,8 @@
 +#define SRV_EXTRA_SYS_SPACE_FIRST_ID	0xFFFFFFE0UL
 +
  #endif
-diff -ruN a/storage/innodb_plugin/include/trx0sys.h b/storage/innodb_plugin/include/trx0sys.h
---- a/storage/innodb_plugin/include/trx0sys.h	2010-08-27 16:08:45.299059235 +0900
-+++ b/storage/innodb_plugin/include/trx0sys.h	2010-08-27 16:37:55.404990159 +0900
+--- a/storage/innodb_plugin/include/trx0sys.h
++++ b/storage/innodb_plugin/include/trx0sys.h
 @@ -124,6 +124,22 @@
  /*=============*/
  	ulint	space,	/*!< in: space */
@@ -482,9 +470,8 @@
  #include "fsp0fsp.h"
  #define	TRX_SYS_PAGE_NO	FSP_TRX_SYS_PAGE_NO
  
-diff -ruN a/storage/innodb_plugin/include/trx0sys.ic b/storage/innodb_plugin/include/trx0sys.ic
---- a/storage/innodb_plugin/include/trx0sys.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/trx0sys.ic	2010-08-27 16:37:55.407990247 +0900
+--- a/storage/innodb_plugin/include/trx0sys.ic
++++ b/storage/innodb_plugin/include/trx0sys.ic
 @@ -71,6 +71,40 @@
  }
  
@@ -526,9 +513,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/innodb_plugin/row/row0mysql.c b/storage/innodb_plugin/row/row0mysql.c
---- a/storage/innodb_plugin/row/row0mysql.c	2010-08-27 16:22:04.287058274 +0900
-+++ b/storage/innodb_plugin/row/row0mysql.c	2010-08-27 16:37:55.410993060 +0900
+--- a/storage/innodb_plugin/row/row0mysql.c
++++ b/storage/innodb_plugin/row/row0mysql.c
 @@ -3391,7 +3391,7 @@
  		/* Do not drop possible .ibd tablespace if something went
  		wrong: we do not want to delete valuable data of the user */
@@ -538,9 +524,8 @@
  			if (!fil_space_for_table_exists_in_mem(space_id,
  							       name_or_path,
  							       is_temp, FALSE,
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:32:40.334058105 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:37:55.414990255 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -145,6 +145,8 @@
  /* size in database pages */
  UNIV_INTERN ulint*	srv_data_file_sizes = NULL;
@@ -550,9 +535,8 @@
  UNIV_INTERN ibool	srv_extra_undoslots = FALSE;
  
  UNIV_INTERN ibool	srv_recovery_stats = FALSE;
-diff -ruN a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c
---- a/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:27:30.236020955 +0900
-+++ b/storage/innodb_plugin/srv/srv0start.c	2010-08-27 16:37:55.418990221 +0900
+--- a/storage/innodb_plugin/srv/srv0start.c
++++ b/storage/innodb_plugin/srv/srv0start.c
 @@ -708,6 +708,7 @@
  /*======================*/
  	ibool*		create_new_db,	/*!< out: TRUE if new database should be
@@ -776,9 +760,8 @@
  	}
  
  	if (!create_new_db && sum_of_new_sizes > 0) {
-diff -ruN a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
---- a/storage/innodb_plugin/trx/trx0sys.c	2010-08-27 16:23:31.045058700 +0900
-+++ b/storage/innodb_plugin/trx/trx0sys.c	2010-08-27 16:37:55.421992951 +0900
+--- a/storage/innodb_plugin/trx/trx0sys.c
++++ b/storage/innodb_plugin/trx/trx0sys.c
 @@ -407,6 +407,152 @@
  
  		goto start_again;

=== modified file 'patches/innodb_show_enhancements.patch'
--- patches/innodb_show_enhancements.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_show_enhancements.patch	2011-07-27 11:11:52 +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/innodb_plugin/Makefile.am b/storage/innodb_plugin/Makefile.am
---- a/storage/innodb_plugin/Makefile.am	2010-04-06 23:07:11.000000000 +0900
-+++ b/storage/innodb_plugin/Makefile.am	2010-04-29 15:22:39.000000000 +0900
+--- a/storage/innodb_plugin/Makefile.am
++++ b/storage/innodb_plugin/Makefile.am
 @@ -226,6 +226,7 @@
  			include/ut0vec.h	\
  			include/ut0vec.ic	\
@@ -16,9 +15,8 @@
  			mem/mem0dbg.c
  
  EXTRA_LIBRARIES=	libinnobase.a
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 15:22:39.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11121,7 +11121,8 @@
  i_s_innodb_cmp,
  i_s_innodb_cmp_reset,
@@ -29,9 +27,8 @@
  mysql_declare_plugin_end;
  
  /** @brief Initialize the default value of innodb_commit_concurrency.
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-04-29 15:22:39.000000000 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -32,6 +32,7 @@
  #include <mysys_err.h>
  #include <my_sys.h>
@@ -220,9 +217,8 @@
  
  UNIV_INTERN struct st_mysql_plugin	i_s_innodb_trx =
  {
-diff -ruN a/storage/innodb_plugin/handler/i_s.h b/storage/innodb_plugin/handler/i_s.h
---- a/storage/innodb_plugin/handler/i_s.h	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/handler/i_s.h	2010-04-29 15:22:39.000000000 +0900
+--- a/storage/innodb_plugin/handler/i_s.h
++++ b/storage/innodb_plugin/handler/i_s.h
 @@ -33,5 +33,6 @@
  extern struct st_mysql_plugin	i_s_innodb_cmp_reset;
  extern struct st_mysql_plugin	i_s_innodb_cmpmem;
@@ -230,9 +226,8 @@
 +extern struct st_mysql_plugin	i_s_innodb_patches;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 15:22:39.000000000 +0900
+--- /dev/null
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -0,0 +1,28 @@
 +/* Copyright (C) 2002-2006 MySQL AB
 +  

=== modified file 'patches/innodb_show_lock_name.patch'
--- patches/innodb_show_lock_name.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_show_lock_name.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:29:12.539982446 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:29:24.322059309 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -9323,8 +9323,8 @@
  			rw_lock_wait_time += mutex->lspent_time;
  		}
@@ -54,9 +53,8 @@
  		buf2len = (uint) my_snprintf(buf2, sizeof buf2,
  					     "os_waits=%lu",
  					     (ulong) block_lock_oswait_count);
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:29:12.542982379 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:29:24.323059066 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -39,5 +39,6 @@
  {"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -64,9 +62,8 @@
 +{"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/sync0rw.h b/storage/innodb_plugin/include/sync0rw.h
---- a/storage/innodb_plugin/include/sync0rw.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/sync0rw.h	2010-08-27 16:29:24.325059383 +0900
+--- a/storage/innodb_plugin/include/sync0rw.h
++++ b/storage/innodb_plugin/include/sync0rw.h
 @@ -113,14 +113,14 @@
  #ifdef UNIV_DEBUG
  # ifdef UNIV_SYNC_DEBUG
@@ -118,9 +115,8 @@
  	unsigned	last_s_line:14;	/*!< Line number where last time s-locked */
  	unsigned	last_x_line:14;	/*!< Line number where last time x-locked */
  #ifdef UNIV_DEBUG
-diff -ruN a/storage/innodb_plugin/include/sync0sync.h b/storage/innodb_plugin/include/sync0sync.h
---- a/storage/innodb_plugin/include/sync0sync.h	2010-08-27 16:13:11.087074844 +0900
-+++ b/storage/innodb_plugin/include/sync0sync.h	2010-08-27 16:29:24.327059254 +0900
+--- a/storage/innodb_plugin/include/sync0sync.h
++++ b/storage/innodb_plugin/include/sync0sync.h
 @@ -73,14 +73,14 @@
  #ifdef UNIV_DEBUG
  # ifdef UNIV_SYNC_DEBUG
@@ -178,9 +174,8 @@
  };
  
  /** The global array of wait cells for implementation of the databases own
-diff -ruN a/storage/innodb_plugin/sync/sync0arr.c b/storage/innodb_plugin/sync/sync0arr.c
---- a/storage/innodb_plugin/sync/sync0arr.c	2010-08-27 15:52:14.340059415 +0900
-+++ b/storage/innodb_plugin/sync/sync0arr.c	2010-08-27 16:29:24.329058856 +0900
+--- a/storage/innodb_plugin/sync/sync0arr.c
++++ b/storage/innodb_plugin/sync/sync0arr.c
 @@ -482,12 +482,12 @@
  		mutex = cell->old_wait_mutex;
  
@@ -208,9 +203,8 @@
  		writer = rw_lock_get_writer(rwlock);
  		if (writer != RW_LOCK_NOT_LOCKED) {
  			fprintf(file,
-diff -ruN a/storage/innodb_plugin/sync/sync0rw.c b/storage/innodb_plugin/sync/sync0rw.c
---- a/storage/innodb_plugin/sync/sync0rw.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/sync/sync0rw.c	2010-08-27 16:29:24.331058289 +0900
+--- a/storage/innodb_plugin/sync/sync0rw.c
++++ b/storage/innodb_plugin/sync/sync0rw.c
 @@ -231,10 +231,10 @@
  # ifdef UNIV_SYNC_DEBUG
  	ulint		level,		/*!< in: level */
@@ -305,9 +299,8 @@
  	}
  
  	/* these stats may not be accurate */
-diff -ruN a/storage/innodb_plugin/sync/sync0sync.c b/storage/innodb_plugin/sync/sync0sync.c
---- a/storage/innodb_plugin/sync/sync0sync.c	2010-08-27 16:13:11.113988290 +0900
-+++ b/storage/innodb_plugin/sync/sync0sync.c	2010-08-27 16:29:24.333058256 +0900
+--- a/storage/innodb_plugin/sync/sync0sync.c
++++ b/storage/innodb_plugin/sync/sync0sync.c
 @@ -239,13 +239,13 @@
  /*==============*/
  	mutex_t*	mutex,		/*!< in: pointer to memory */

=== modified file 'patches/innodb_show_status.patch'
--- patches/innodb_show_status.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_show_status.patch	2011-07-27 11:11:52 +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/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -3897,14 +3897,16 @@
  	buf_pool_mutex_enter();
  
@@ -30,9 +29,8 @@
  		(ulong) UT_LIST_GET_LEN(buf_pool->free),
  		(ulong) UT_LIST_GET_LEN(buf_pool->LRU),
  		(ulong) buf_pool->LRU_old_len,
-diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
---- a/storage/innodb_plugin/fil/fil0fil.c	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/fil/fil0fil.c	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/fil/fil0fil.c
++++ b/storage/innodb_plugin/fil/fil0fil.c
 @@ -4833,3 +4833,30 @@
  
  	fil_system = NULL;
@@ -64,9 +62,8 @@
 +               return 0;
 +       }
 +}
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 15:28:20.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -10821,6 +10821,16 @@
    "Force InnoDB to not use next-key locking, to use only row-level locking.",
    NULL, NULL, FALSE);
@@ -102,9 +99,8 @@
    MYSQL_SYSVAR(version),
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(change_buffering),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 15:28:20.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -24,5 +24,6 @@
         const char *link;
  }innodb_enhancements[] = {
@@ -112,9 +108,8 @@
 +{"innodb_show_status","Improvements to SHOW INNODB STATUS","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h
---- a/storage/innodb_plugin/include/fil0fil.h	2010-04-06 23:07:12.000000000 +0900
-+++ b/storage/innodb_plugin/include/fil0fil.h	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/include/fil0fil.h
++++ b/storage/innodb_plugin/include/fil0fil.h
 @@ -725,6 +725,17 @@
  /*============================*/
  	ulint		id);	/*!< in: space id */
@@ -133,9 +128,8 @@
  typedef	struct fil_space_struct	fil_space_t;
  
  #endif
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-04-06 23:07:13.000000000 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -128,6 +128,9 @@
  extern char	srv_adaptive_flushing;
  
@@ -146,9 +140,8 @@
  /* The sort order table of the MySQL latin1_swedish_ci character set
  collation */
  extern const byte*	srv_latin1_ordering;
-diff -ruN a/storage/innodb_plugin/include/thr0loc.h b/storage/innodb_plugin/include/thr0loc.h
---- a/storage/innodb_plugin/include/thr0loc.h	2010-04-06 23:07:13.000000000 +0900
-+++ b/storage/innodb_plugin/include/thr0loc.h	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/include/thr0loc.h
++++ b/storage/innodb_plugin/include/thr0loc.h
 @@ -83,6 +83,17 @@
  thr_local_get_in_ibuf_field(void);
  /*=============================*/
@@ -167,9 +160,8 @@
  #ifndef UNIV_NONINL
  #include "thr0loc.ic"
  #endif
-diff -ruN a/storage/innodb_plugin/lock/lock0lock.c b/storage/innodb_plugin/lock/lock0lock.c
---- a/storage/innodb_plugin/lock/lock0lock.c	2010-04-06 23:07:13.000000000 +0900
-+++ b/storage/innodb_plugin/lock/lock0lock.c	2010-04-29 15:33:51.000000000 +0900
+--- a/storage/innodb_plugin/lock/lock0lock.c
++++ b/storage/innodb_plugin/lock/lock0lock.c
 @@ -4379,6 +4379,7 @@
  
  	putc('\n', file);
@@ -206,9 +198,8 @@
  		      " SUPPRESSING FURTHER PRINTS\n",
  		      file);
  
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-04-06 23:07:14.000000000 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-04-29 15:40:14.000000000 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -171,6 +171,9 @@
  the checkpoints. */
  UNIV_INTERN char	srv_adaptive_flushing	= TRUE;
@@ -386,9 +377,8 @@
  	fputs("----------------------------\n"
  	      "END OF INNODB MONITOR OUTPUT\n"
  	      "============================\n", file);
-diff -ruN a/storage/innodb_plugin/sync/sync0arr.c b/storage/innodb_plugin/sync/sync0arr.c
---- a/storage/innodb_plugin/sync/sync0arr.c	2010-04-06 23:07:14.000000000 +0900
-+++ b/storage/innodb_plugin/sync/sync0arr.c	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/sync/sync0arr.c
++++ b/storage/innodb_plugin/sync/sync0arr.c
 @@ -471,7 +471,7 @@
  
  	fprintf(file,
@@ -398,9 +388,8 @@
  		(ulong) os_thread_pf(cell->thread), cell->file,
  		(ulong) cell->line,
  		difftime(time(NULL), cell->reservation_time));
-diff -ruN a/storage/innodb_plugin/thr/thr0loc.c b/storage/innodb_plugin/thr/thr0loc.c
---- a/storage/innodb_plugin/thr/thr0loc.c	2010-04-06 23:07:14.000000000 +0900
-+++ b/storage/innodb_plugin/thr/thr0loc.c	2010-04-29 15:28:56.000000000 +0900
+--- a/storage/innodb_plugin/thr/thr0loc.c
++++ b/storage/innodb_plugin/thr/thr0loc.c
 @@ -49,6 +49,7 @@
  
  /** The hash table. The module is not yet initialized when it is NULL. */

=== modified file 'patches/innodb_show_sys_tables.patch'
--- patches/innodb_show_sys_tables.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_show_sys_tables.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:45:46.194411503 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:49:26.171990559 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -11871,6 +11871,9 @@
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
@@ -18,9 +17,8 @@
  i_s_innodb_patches
  mysql_declare_plugin_end;
  
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:36:03.497021073 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:49:26.177990679 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -46,6 +46,7 @@
  #include "trx0rseg.h" /* for trx_rseg_struct */
  #include "trx0sys.h" /* for trx_sys */
@@ -29,13 +27,10 @@
  #include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
  }
  
-@@ -3111,6 +3112,674 @@
- 	STRUCT_FLD(deinit, i_s_common_deinit),
- 	STRUCT_FLD(version, 0x0100 /* 1.0 */),
- 	STRUCT_FLD(status_vars, NULL),
-+	STRUCT_FLD(system_vars, NULL),
-+	STRUCT_FLD(__reserved1, NULL)
-+};
+@@ -3114,3 +3115,671 @@
+ 	STRUCT_FLD(system_vars, NULL),
+ 	STRUCT_FLD(__reserved1, NULL)
+ };
 +
 +static ST_FIELD_INFO	i_s_innodb_sys_tables_info[] =
 +{
@@ -701,12 +696,11 @@
 +	STRUCT_FLD(deinit, i_s_common_deinit),
 +	STRUCT_FLD(version, 0x0100 /* 1.0 */),
 +	STRUCT_FLD(status_vars, NULL),
- 	STRUCT_FLD(system_vars, NULL),
- 	STRUCT_FLD(__reserved1, NULL)
- };
-diff -ruN a/storage/innodb_plugin/handler/i_s.h b/storage/innodb_plugin/handler/i_s.h
---- a/storage/innodb_plugin/handler/i_s.h	2010-08-27 16:29:12.542982379 +0900
-+++ b/storage/innodb_plugin/handler/i_s.h	2010-08-27 16:49:26.179990535 +0900
++	STRUCT_FLD(system_vars, NULL),
++	STRUCT_FLD(__reserved1, NULL)
++};
+--- a/storage/innodb_plugin/handler/i_s.h
++++ b/storage/innodb_plugin/handler/i_s.h
 @@ -41,5 +41,8 @@
  extern struct st_mysql_plugin	i_s_innodb_table_stats;
  extern struct st_mysql_plugin	i_s_innodb_index_stats;
@@ -716,9 +710,8 @@
 +extern struct st_mysql_plugin	i_s_innodb_sys_stats;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:45:46.199018686 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:49:26.173350991 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -46,5 +46,6 @@
  {"innodb_pass_corrupt_table","Treat tables as corrupt instead of crash, when meet corrupt blocks","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_fast_checksum","Using the checksum on 32bit-unit calculation","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"},

=== modified file 'patches/innodb_split_buf_pool_mutex.patch'
--- patches/innodb_split_buf_pool_mutex.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_split_buf_pool_mutex.patch	2011-07-27 11:11:52 +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/innodb_plugin/btr/btr0cur.c b/storage/innodb_plugin/btr/btr0cur.c
---- a/storage/innodb_plugin/btr/btr0cur.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/btr/btr0cur.c	2010-08-27 16:11:40.593021205 +0900
+--- a/storage/innodb_plugin/btr/btr0cur.c
++++ b/storage/innodb_plugin/btr/btr0cur.c
 @@ -3790,7 +3790,8 @@
  
  	mtr_commit(mtr);
@@ -44,9 +43,8 @@
  	mutex_exit(&block->mutex);
  }
  
-diff -ruN a/storage/innodb_plugin/btr/btr0sea.c b/storage/innodb_plugin/btr/btr0sea.c
---- a/storage/innodb_plugin/btr/btr0sea.c	2010-08-27 16:11:12.151975789 +0900
-+++ b/storage/innodb_plugin/btr/btr0sea.c	2010-08-27 16:11:40.593021205 +0900
+--- a/storage/innodb_plugin/btr/btr0sea.c
++++ b/storage/innodb_plugin/btr/btr0sea.c
 @@ -1925,7 +1925,8 @@
  	rec_offs_init(offsets_);
  
@@ -99,9 +97,8 @@
  	rw_lock_x_unlock(&btr_search_latch);
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
-diff -ruN a/storage/innodb_plugin/buf/buf0buddy.c b/storage/innodb_plugin/buf/buf0buddy.c
---- a/storage/innodb_plugin/buf/buf0buddy.c	2010-08-27 15:54:59.015990108 +0900
-+++ b/storage/innodb_plugin/buf/buf0buddy.c	2010-08-27 16:11:40.596022762 +0900
+--- a/storage/innodb_plugin/buf/buf0buddy.c
++++ b/storage/innodb_plugin/buf/buf0buddy.c
 @@ -82,10 +82,11 @@
  	if (b) UNIV_MEM_VALID(b, BUF_BUDDY_LOW << i);
  #endif /* UNIV_DEBUG_VALGRIND */
@@ -574,9 +571,8 @@
  
  			buf = bpage;
  			UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i);
-diff -ruN a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c
---- a/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 15:55:39.385322978 +0900
-+++ b/storage/innodb_plugin/buf/buf0buf.c	2010-08-27 16:11:40.603021006 +0900
+--- a/storage/innodb_plugin/buf/buf0buf.c
++++ b/storage/innodb_plugin/buf/buf0buf.c
 @@ -251,6 +251,12 @@
  /** mutex protecting the buffer pool struct and control blocks, except the
  read-write lock in them */
@@ -1851,9 +1847,8 @@
  
  	return(len);
  }
-diff -ruN a/storage/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c
---- a/storage/innodb_plugin/buf/buf0flu.c	2010-08-27 15:54:59.022021357 +0900
-+++ b/storage/innodb_plugin/buf/buf0flu.c	2010-08-27 16:11:40.607020890 +0900
+--- a/storage/innodb_plugin/buf/buf0flu.c
++++ b/storage/innodb_plugin/buf/buf0flu.c
 @@ -102,7 +102,8 @@
  	const ib_rbt_node_t*	c_node;
  	const ib_rbt_node_t*	p_node;
@@ -2408,9 +2403,8 @@
  
  	return(ret);
  }
-diff -ruN a/storage/innodb_plugin/buf/buf0lru.c b/storage/innodb_plugin/buf/buf0lru.c
---- a/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 15:54:59.025058614 +0900
-+++ b/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 16:11:40.611021077 +0900
+--- a/storage/innodb_plugin/buf/buf0lru.c
++++ b/storage/innodb_plugin/buf/buf0lru.c
 @@ -145,8 +145,9 @@
  void
  buf_LRU_block_free_hashed_page(
@@ -3400,9 +3394,8 @@
 +	mutex_exit(&LRU_list_mutex);
  }
  #endif /* UNIV_DEBUG_PRINT || UNIV_DEBUG || UNIV_BUF_DEBUG */
-diff -ruN a/storage/innodb_plugin/buf/buf0rea.c b/storage/innodb_plugin/buf/buf0rea.c
---- a/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 15:54:59.027059378 +0900
-+++ b/storage/innodb_plugin/buf/buf0rea.c	2010-08-27 16:11:40.614021339 +0900
+--- a/storage/innodb_plugin/buf/buf0rea.c
++++ b/storage/innodb_plugin/buf/buf0rea.c
 @@ -290,10 +290,12 @@
  
  	tablespace_version = fil_space_get_version(space);
@@ -3470,9 +3463,8 @@
  
  	if ((offset == low) && (succ_offset == offset + 1)) {
  
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-08-27 15:59:21.753412068 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:11:40.617020805 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -2229,7 +2229,8 @@
  
  	RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
@@ -3493,9 +3485,8 @@
  	DBUG_RETURN(status);
  }
  
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:11:12.167183642 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:11:40.614990183 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -33,5 +33,6 @@
  {"innodb_overwrite_relay_log_info","overwrite relay-log.info when slave recovery","Building as plugin, it is not used.","http://www.percona.com/docs/wiki/percona-xtradb:innodb_overwrite_relay_log_info"},
  {"innodb_thread_concurrency_timer_based","use InnoDB timer based concurrency throttling (backport from MySQL 5.4.0)","",""},
@@ -3503,9 +3494,8 @@
 +{"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/buf0buddy.h b/storage/innodb_plugin/include/buf0buddy.h
---- a/storage/innodb_plugin/include/buf0buddy.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0buddy.h	2010-08-27 16:11:40.618988049 +0900
+--- a/storage/innodb_plugin/include/buf0buddy.h
++++ b/storage/innodb_plugin/include/buf0buddy.h
 @@ -49,10 +49,11 @@
  buf_buddy_alloc(
  /*============*/
@@ -3529,9 +3519,8 @@
  	__attribute__((nonnull));
  
  /** Statistics of buddy blocks of a given size. */
-diff -ruN a/storage/innodb_plugin/include/buf0buddy.ic b/storage/innodb_plugin/include/buf0buddy.ic
---- a/storage/innodb_plugin/include/buf0buddy.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0buddy.ic	2010-08-27 16:11:40.619989772 +0900
+--- a/storage/innodb_plugin/include/buf0buddy.ic
++++ b/storage/innodb_plugin/include/buf0buddy.ic
 @@ -44,10 +44,11 @@
  /*================*/
  	ulint	i,	/*!< in: index of buf_pool->zip_free[],
@@ -3603,9 +3592,8 @@
  }
  
  #ifdef UNIV_MATERIALIZE
-diff -ruN a/storage/innodb_plugin/include/buf0buf.h b/storage/innodb_plugin/include/buf0buf.h
---- a/storage/innodb_plugin/include/buf0buf.h	2010-08-27 15:55:39.399063353 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.h	2010-08-27 16:11:40.622020552 +0900
+--- a/storage/innodb_plugin/include/buf0buf.h
++++ b/storage/innodb_plugin/include/buf0buf.h
 @@ -713,6 +713,15 @@
  	const buf_page_t*	bpage)	/*!< in: pointer to control block */
  	__attribute__((pure));
@@ -3679,9 +3667,8 @@
  	mutex_enter(&buf_pool_mutex);		\
  } while (0)
  
-diff -ruN a/storage/innodb_plugin/include/buf0buf.ic b/storage/innodb_plugin/include/buf0buf.ic
---- a/storage/innodb_plugin/include/buf0buf.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0buf.ic	2010-08-27 16:11:40.624990413 +0900
+--- a/storage/innodb_plugin/include/buf0buf.ic
++++ b/storage/innodb_plugin/include/buf0buf.ic
 @@ -121,7 +121,9 @@
  	buf_page_t*	bpage;
  	ib_uint64_t	lsn;
@@ -3916,9 +3903,8 @@
  
  	mutex_enter(&block->mutex);
  
-diff -ruN a/storage/innodb_plugin/include/buf0flu.ic b/storage/innodb_plugin/include/buf0flu.ic
---- a/storage/innodb_plugin/include/buf0flu.ic	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0flu.ic	2010-08-27 16:11:40.625993554 +0900
+--- a/storage/innodb_plugin/include/buf0flu.ic
++++ b/storage/innodb_plugin/include/buf0flu.ic
 @@ -55,13 +55,23 @@
  	buf_block_t*	block,	/*!< in: block which is modified */
  	mtr_t*		mtr)	/*!< in: mtr */
@@ -4016,9 +4002,8 @@
 +	mutex_exit(&(block->mutex));
  }
  #endif /* !UNIV_HOTBACKUP */
-diff -ruN a/storage/innodb_plugin/include/buf0lru.h b/storage/innodb_plugin/include/buf0lru.h
---- a/storage/innodb_plugin/include/buf0lru.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/buf0lru.h	2010-08-27 16:11:40.627990038 +0900
+--- a/storage/innodb_plugin/include/buf0lru.h
++++ b/storage/innodb_plugin/include/buf0lru.h
 @@ -110,8 +110,9 @@
  buf_LRU_free_block(
  /*===============*/
@@ -4040,9 +4025,8 @@
  /******************************************************************//**
  Adds a block to the LRU list. */
  UNIV_INTERN
-diff -ruN a/storage/innodb_plugin/include/sync0sync.h b/storage/innodb_plugin/include/sync0sync.h
---- a/storage/innodb_plugin/include/sync0sync.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/sync0sync.h	2010-08-27 16:11:40.628990180 +0900
+--- a/storage/innodb_plugin/include/sync0sync.h
++++ b/storage/innodb_plugin/include/sync0sync.h
 @@ -487,8 +487,14 @@
  					SYNC_SEARCH_SYS, as memory allocation
  					can call routines there! Otherwise
@@ -4068,9 +4052,8 @@
  				may be) threads waiting in the global wait
  				array for this mutex to be released.
  				Otherwise, this is 0. */
-diff -ruN a/storage/innodb_plugin/mtr/mtr0mtr.c b/storage/innodb_plugin/mtr/mtr0mtr.c
---- a/storage/innodb_plugin/mtr/mtr0mtr.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/mtr/mtr0mtr.c	2010-08-27 16:11:40.631020912 +0900
+--- a/storage/innodb_plugin/mtr/mtr0mtr.c
++++ b/storage/innodb_plugin/mtr/mtr0mtr.c
 @@ -33,6 +33,7 @@
  #include "page0types.h"
  #include "mtr0log.h"
@@ -4156,9 +4139,8 @@
  
  			mtr_memo_slot_release(mtr, slot);
  
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:11:12.194989878 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:11:40.634022489 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -2869,7 +2869,7 @@
  
  					mutex_exit(&(log_sys->mutex));
@@ -4177,9 +4159,8 @@
  
  					if (!srv_use_doublewrite_buf) {
  						/* flush is faster than when doublewrite */
-diff -ruN a/storage/innodb_plugin/sync/sync0sync.c b/storage/innodb_plugin/sync/sync0sync.c
---- a/storage/innodb_plugin/sync/sync0sync.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/sync/sync0sync.c	2010-08-27 16:11:40.636021261 +0900
+--- a/storage/innodb_plugin/sync/sync0sync.c
++++ b/storage/innodb_plugin/sync/sync0sync.c
 @@ -254,7 +254,7 @@
  	mutex->lock_word = 0;
  #endif

=== modified file 'patches/innodb_stats.patch'
--- patches/innodb_stats.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_stats.patch	2011-07-27 11:11:52 +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/innodb_plugin/dict/dict0boot.c b/storage/innodb_plugin/dict/dict0boot.c
---- a/storage/innodb_plugin/dict/dict0boot.c	2010-08-27 16:11:12.152990021 +0900
-+++ b/storage/innodb_plugin/dict/dict0boot.c	2010-08-27 16:16:49.202982244 +0900
+--- a/storage/innodb_plugin/dict/dict0boot.c
++++ b/storage/innodb_plugin/dict/dict0boot.c
 @@ -263,6 +263,29 @@
  	/* Get the dictionary header */
  	dict_hdr = dict_hdr_get(&mtr);
@@ -101,9 +100,8 @@
  
  	mutex_exit(&(dict_sys->mutex));
  }
-diff -ruN a/storage/innodb_plugin/dict/dict0crea.c b/storage/innodb_plugin/dict/dict0crea.c
---- a/storage/innodb_plugin/dict/dict0crea.c	2010-08-27 16:11:12.152990021 +0900
-+++ b/storage/innodb_plugin/dict/dict0crea.c	2010-08-27 16:16:49.205982429 +0900
+--- a/storage/innodb_plugin/dict/dict0crea.c
++++ b/storage/innodb_plugin/dict/dict0crea.c
 @@ -508,6 +508,56 @@
  }
  
@@ -280,16 +278,10 @@
  	}
  
  	if (node->state == INDEX_CREATE_INDEX_TREE) {
-@@ -1179,6 +1318,66 @@
- 		return(NULL);
- 	}
+@@ -1185,6 +1324,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/innodb_plugin/dict/dict0dict.c b/storage/innodb_plugin/dict/dict0dict.c
---- a/storage/innodb_plugin/dict/dict0dict.c	2010-08-27 16:11:12.155144214 +0900
-+++ b/storage/innodb_plugin/dict/dict0dict.c	2010-08-27 16:16:49.213982476 +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/innodb_plugin/dict/dict0dict.c
++++ b/storage/innodb_plugin/dict/dict0dict.c
 @@ -739,7 +739,7 @@
  		print an error message and return without doing
  		anything. */
@@ -808,9 +805,8 @@
  
  	dict_table_stats_lock(table, RW_S_LATCH);
  
-diff -ruN a/storage/innodb_plugin/dict/dict0load.c b/storage/innodb_plugin/dict/dict0load.c
---- a/storage/innodb_plugin/dict/dict0load.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/dict/dict0load.c	2010-08-27 16:16:49.218982387 +0900
+--- a/storage/innodb_plugin/dict/dict0load.c
++++ b/storage/innodb_plugin/dict/dict0load.c
 @@ -223,7 +223,7 @@
  
  			if (dict_table_get_first_index(table)) {
@@ -820,9 +816,8 @@
  			}
  
  			dict_table_print_low(table);
-diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:15:55.192417748 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:16:49.233984845 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -190,6 +190,7 @@
  static my_bool	innobase_rollback_on_timeout		= FALSE;
  static my_bool	innobase_create_status_file		= FALSE;
@@ -989,9 +984,8 @@
  i_s_innodb_patches
  mysql_declare_plugin_end;
  
-diff -ruN a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc
---- a/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:13:11.075059060 +0900
-+++ b/storage/innodb_plugin/handler/i_s.cc	2010-08-27 16:16:49.253982474 +0900
+--- a/storage/innodb_plugin/handler/i_s.cc
++++ b/storage/innodb_plugin/handler/i_s.cc
 @@ -45,6 +45,7 @@
  #include "btr0btr.h" /* for btr_page_get_index_id */
  #include "trx0rseg.h" /* for trx_rseg_struct */
@@ -1348,9 +1342,8 @@
 +	STRUCT_FLD(system_vars, NULL),
 +	STRUCT_FLD(__reserved1, NULL)
 +};
-diff -ruN a/storage/innodb_plugin/handler/i_s.h b/storage/innodb_plugin/handler/i_s.h
---- a/storage/innodb_plugin/handler/i_s.h	2010-08-27 15:59:21.754987936 +0900
-+++ b/storage/innodb_plugin/handler/i_s.h	2010-08-27 16:16:49.255984731 +0900
+--- a/storage/innodb_plugin/handler/i_s.h
++++ b/storage/innodb_plugin/handler/i_s.h
 @@ -38,5 +38,7 @@
  extern struct st_mysql_plugin	i_s_innodb_cmpmem_reset;
  extern struct st_mysql_plugin	i_s_innodb_patches;
@@ -1359,9 +1352,8 @@
 +extern struct st_mysql_plugin	i_s_innodb_index_stats;
  
  #endif /* i_s_h */
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:15:55.197404531 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-08-27 16:16:49.249142399 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -35,5 +35,6 @@
  {"innodb_expand_import","convert .ibd file automatically when import tablespace","the files are generated by xtrabackup export mode.","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -1369,9 +1361,8 @@
 +{"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/dict0boot.h b/storage/innodb_plugin/include/dict0boot.h
---- a/storage/innodb_plugin/include/dict0boot.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/dict0boot.h	2010-08-27 16:16:49.260982522 +0900
+--- a/storage/innodb_plugin/include/dict0boot.h
++++ b/storage/innodb_plugin/include/dict0boot.h
 @@ -101,6 +101,7 @@
  #define DICT_COLUMNS_ID		ut_dulint_create(0, 2)
  #define DICT_INDEXES_ID		ut_dulint_create(0, 3)
@@ -1411,9 +1402,8 @@
  #ifndef UNIV_NONINL
  #include "dict0boot.ic"
  #endif
-diff -ruN a/storage/innodb_plugin/include/dict0crea.h b/storage/innodb_plugin/include/dict0crea.h
---- a/storage/innodb_plugin/include/dict0crea.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/dict0crea.h	2010-08-27 16:16:49.262982080 +0900
+--- a/storage/innodb_plugin/include/dict0crea.h
++++ b/storage/innodb_plugin/include/dict0crea.h
 @@ -53,6 +53,14 @@
  	dict_index_t*	index,	/*!< in: index to create, built as a memory data
  				structure */
@@ -1467,9 +1457,8 @@
  
  #ifndef UNIV_NONINL
  #include "dict0crea.ic"
-diff -ruN a/storage/innodb_plugin/include/dict0dict.h b/storage/innodb_plugin/include/dict0dict.h
---- a/storage/innodb_plugin/include/dict0dict.h	2010-08-27 16:11:12.177142545 +0900
-+++ b/storage/innodb_plugin/include/dict0dict.h	2010-08-27 16:16:49.263981911 +0900
+--- a/storage/innodb_plugin/include/dict0dict.h
++++ b/storage/innodb_plugin/include/dict0dict.h
 @@ -1057,10 +1057,18 @@
  dict_update_statistics(
  /*===================*/
@@ -1498,9 +1487,8 @@
  };
  #endif /* !UNIV_HOTBACKUP */
  
-diff -ruN a/storage/innodb_plugin/include/que0que.h b/storage/innodb_plugin/include/que0que.h
---- a/storage/innodb_plugin/include/que0que.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/que0que.h	2010-08-27 16:16:49.266982471 +0900
+--- a/storage/innodb_plugin/include/que0que.h
++++ b/storage/innodb_plugin/include/que0que.h
 @@ -495,6 +495,8 @@
  #define QUE_NODE_CALL		31
  #define QUE_NODE_EXIT		32
@@ -1510,9 +1498,8 @@
  /* Query thread states */
  #define QUE_THR_RUNNING		1
  #define QUE_THR_PROCEDURE_WAIT	2
-diff -ruN a/storage/innodb_plugin/include/row0mysql.h b/storage/innodb_plugin/include/row0mysql.h
---- a/storage/innodb_plugin/include/row0mysql.h	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/include/row0mysql.h	2010-08-27 16:16:49.271982518 +0900
+--- a/storage/innodb_plugin/include/row0mysql.h
++++ b/storage/innodb_plugin/include/row0mysql.h
 @@ -376,6 +376,22 @@
  					then checked for not being too
  					large. */
@@ -1536,9 +1523,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/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:15:55.197989840 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-27 16:16:49.285142419 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -197,6 +197,9 @@
  extern ibool	srv_innodb_status;
  
@@ -1549,9 +1535,8 @@
  
  extern ibool	srv_use_doublewrite_buf;
  extern ibool	srv_use_checksums;
-diff -ruN a/storage/innodb_plugin/que/que0que.c b/storage/innodb_plugin/que/que0que.c
---- a/storage/innodb_plugin/que/que0que.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/que/que0que.c	2010-08-27 16:16:49.291984923 +0900
+--- a/storage/innodb_plugin/que/que0que.c
++++ b/storage/innodb_plugin/que/que0que.c
 @@ -622,11 +622,21 @@
  
  		que_graph_free_recursive(cre_ind->ind_def);
@@ -1592,9 +1577,8 @@
  	} else if (type == QUE_NODE_ROW_PRINTF) {
  		thr = row_printf_step(thr);
  	} else {
-diff -ruN a/storage/innodb_plugin/row/row0ins.c b/storage/innodb_plugin/row/row0ins.c
---- a/storage/innodb_plugin/row/row0ins.c	2011-02-12 04:20:43.000000000 +0900
-+++ b/storage/innodb_plugin/row/row0ins.c	2011-03-30 15:57:54.000000000 +0900
+--- a/storage/innodb_plugin/row/row0ins.c
++++ b/storage/innodb_plugin/row/row0ins.c
 @@ -2020,6 +2020,8 @@
  	}
  
@@ -1604,9 +1588,8 @@
  	{
  		page_t*	page = btr_cur_get_page(&cursor);
  		rec_t*	first_rec = page_rec_get_next(
-diff -ruN a/storage/innodb_plugin/row/row0merge.c b/storage/innodb_plugin/row/row0merge.c
---- a/storage/innodb_plugin/row/row0merge.c	2010-08-04 02:24:19.000000000 +0900
-+++ b/storage/innodb_plugin/row/row0merge.c	2010-08-27 16:16:49.295984498 +0900
+--- a/storage/innodb_plugin/row/row0merge.c
++++ b/storage/innodb_plugin/row/row0merge.c
 @@ -2021,6 +2021,8 @@
  		"UPDATE SYS_INDEXES SET NAME=CONCAT('"
  		TEMP_INDEX_PREFIX_STR "', NAME) WHERE ID = :indexid;\n"
@@ -1616,9 +1599,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/innodb_plugin/row/row0mysql.c b/storage/innodb_plugin/row/row0mysql.c
---- a/storage/innodb_plugin/row/row0mysql.c	2010-08-04 02:24:20.000000000 +0900
-+++ b/storage/innodb_plugin/row/row0mysql.c	2010-08-27 16:16:49.304981955 +0900
+--- a/storage/innodb_plugin/row/row0mysql.c
++++ b/storage/innodb_plugin/row/row0mysql.c
 @@ -862,6 +862,9 @@
  
  	table->stat_modified_counter = counter + 1;
@@ -1728,9 +1710,8 @@
  			   "               DELETE FROM SYS_FIELDS\n"
  			   "               WHERE INDEX_ID = index_id;\n"
  			   "               DELETE FROM SYS_INDEXES\n"
-diff -ruN a/storage/innodb_plugin/row/row0row.c b/storage/innodb_plugin/row/row0row.c
---- a/storage/innodb_plugin/row/row0row.c	2011-02-12 04:20:26.000000000 +0900
-+++ b/storage/innodb_plugin/row/row0row.c	2011-03-30 15:57:54.000000000 +0900
+--- a/storage/innodb_plugin/row/row0row.c
++++ b/storage/innodb_plugin/row/row0row.c
 @@ -347,6 +347,14 @@
  
  	rec_len = rec_offs_n_fields(offsets);
@@ -1761,9 +1742,8 @@
  		field = rec_get_nth_field(rec, offsets, i, &len);
  
  		dfield_set_data(dfield, field, len);
-diff -ruN a/storage/innodb_plugin/row/row0upd.c b/storage/innodb_plugin/row/row0upd.c
---- a/storage/innodb_plugin/row/row0upd.c	2011-02-12 04:20:43.000000000 +0900
-+++ b/storage/innodb_plugin/row/row0upd.c	2011-03-30 15:57:54.000000000 +0900
+--- a/storage/innodb_plugin/row/row0upd.c
++++ b/storage/innodb_plugin/row/row0upd.c
 @@ -439,6 +439,12 @@
  				0);
  		}
@@ -1796,9 +1776,8 @@
  		data = rec_get_nth_field(rec, offsets, i, &len);
  
  		dfield = dtuple_get_nth_field(entry, i);
-diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:15:55.198987678 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-27 16:16:49.311984856 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -369,6 +369,9 @@
  /* When estimating number of different key values in an index, sample
  this many index pages */
@@ -1809,9 +1788,8 @@
  
  UNIV_INTERN ibool	srv_use_doublewrite_buf	= TRUE;
  UNIV_INTERN ibool	srv_use_checksums = TRUE;
-diff -ruN a/storage/innodb_plugin/trx/trx0rec.c b/storage/innodb_plugin/trx/trx0rec.c
---- a/storage/innodb_plugin/trx/trx0rec.c	2011-02-12 04:20:26.000000000 +0900
-+++ b/storage/innodb_plugin/trx/trx0rec.c	2011-03-30 15:57:54.000000000 +0900
+--- a/storage/innodb_plugin/trx/trx0rec.c
++++ b/storage/innodb_plugin/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_swap_builtin_plugin.patch'
--- patches/innodb_swap_builtin_plugin.patch	2011-07-22 05:41:42 +0000
+++ patches/innodb_swap_builtin_plugin.patch	2011-07-27 11:11:52 +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/mysql-test/include/have_innodb_plugin.inc b/mysql-test/include/have_innodb_plugin.inc
---- a/mysql-test/include/have_innodb_plugin.inc	2010-05-07 00:59:10.000000000 +0900
-+++ b/mysql-test/include/have_innodb_plugin.inc	2010-05-25 18:12:49.000000000 +0900
+--- a/mysql-test/include/have_innodb_plugin.inc
++++ b/mysql-test/include/have_innodb_plugin.inc
 @@ -1,5 +1,5 @@
  --source include/not_embedded.inc
  disable_query_log;
@@ -15,9 +14,8 @@
 -SELECT (plugin_library LIKE 'ha_innodb_plugin%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active';
 +select (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` from information_schema.engines where engine = 'innodb';
  enable_query_log;
-diff -ruN a/mysql-test/include/read_many_rows.inc b/mysql-test/include/read_many_rows.inc
---- a/mysql-test/include/read_many_rows.inc	2010-04-06 23:37:12.000000000 +0900
-+++ b/mysql-test/include/read_many_rows.inc	2010-05-18 15:39:02.000000000 +0900
+--- a/mysql-test/include/read_many_rows.inc
++++ b/mysql-test/include/read_many_rows.inc
 @@ -112,8 +112,12 @@
  insert into t1 values(1);
  
@@ -52,9 +50,8 @@
  # check that the whole transaction was rolled back
  select * from t2;
  
-diff -ruN a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
---- a/mysql-test/lib/mtr_cases.pm	2010-07-09 21:34:53.000000000 +0900
-+++ b/mysql-test/lib/mtr_cases.pm	2010-07-26 21:23:05.378120605 +0900
+--- a/mysql-test/lib/mtr_cases.pm
++++ b/mysql-test/lib/mtr_cases.pm
 @@ -944,7 +944,7 @@
      push(@{$tinfo->{'slave_opt'}}, "--loose-federated");
    }
@@ -101,9 +98,8 @@
    else
    {
      push(@{$tinfo->{'master_opt'}}, "--loose-skip-innodb");
-diff -ruN a/mysql-test/r/read_many_rows_innodb.result b/mysql-test/r/read_many_rows_innodb.result
---- a/mysql-test/r/read_many_rows_innodb.result	2010-04-06 23:36:58.000000000 +0900
-+++ b/mysql-test/r/read_many_rows_innodb.result	2010-05-18 15:39:24.000000000 +0900
+--- a/mysql-test/r/read_many_rows_innodb.result
++++ b/mysql-test/r/read_many_rows_innodb.result
 @@ -64,7 +64,8 @@
  insert into t2 values(123);
  insert into t1 values(1);
@@ -138,9 +134,8 @@
  select * from t2;
  f2
  drop procedure proc24989;
-diff -ruN a/storage/innobase/plug.in b/storage/innobase/plug.in
---- a/storage/innobase/plug.in	2010-04-06 23:07:11.000000000 +0900
-+++ b/storage/innobase/plug.in	2010-04-28 19:12:59.000000000 +0900
+--- a/storage/innobase/plug.in
++++ b/storage/innobase/plug.in
 @@ -1,7 +1,6 @@
  MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
          [Transactional Tables using InnoDB], [max,max-no-ndb])
@@ -149,9 +144,8 @@
  MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
  MYSQL_PLUGIN_ACTIONS(innobase,  [
    AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
-diff -ruN a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in
---- a/storage/innodb_plugin/plug.in	2010-04-06 23:07:14.000000000 +0900
-+++ b/storage/innodb_plugin/plug.in	2010-04-28 19:12:59.000000000 +0900
+--- a/storage/innodb_plugin/plug.in
++++ b/storage/innodb_plugin/plug.in
 @@ -19,7 +19,7 @@
  MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
  # Enable if you know what you are doing (trying to link both InnoDB and
@@ -161,9 +155,8 @@
  MYSQL_PLUGIN_DYNAMIC(innodb_plugin,  [ha_innodb_plugin.la])
  MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
    AC_CHECK_HEADERS(sched.h)
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2011-04-12 15:11:35.000000000 +0300
-+++ b/sql/mysqld.cc	2011-06-20 08:42:40.935826003 +0300
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
 @@ -8198,7 +8198,9 @@
      thd_startup_options|=OPTION_BIG_TABLES;
      break;
@@ -175,15 +168,13 @@
      break;
    case (int) OPT_ISAM_LOG:
      opt_myisam_log=1;
-diff -ruN a/mysql-test/t/innodb_ignore_builtin-master.opt b/mysql-test/t/innodb_ignore_builtin-master.opt
---- a/mysql-test/t/innodb_ignore_builtin-master.opt	2011-04-12 15:37:47.000000000 +0300
-+++ b/mysql-test/t/innodb_ignore_builtin-master.opt	2011-06-20 08:34:43.585825995 +0300
+--- a/mysql-test/t/innodb_ignore_builtin-master.opt
++++ b/mysql-test/t/innodb_ignore_builtin-master.opt
 @@ -1 +1 @@
 ---ignore_builtin_innodb
 +
-diff -ruN a/mysql-test/t/innodb_ignore_builtin.test b/mysql-test/t/innodb_ignore_builtin.test
---- a/mysql-test/t/innodb_ignore_builtin.test	2011-04-12 15:37:47.000000000 +0300
-+++ b/mysql-test/t/innodb_ignore_builtin.test	2011-06-20 08:34:03.025825995 +0300
+--- a/mysql-test/t/innodb_ignore_builtin.test
++++ b/mysql-test/t/innodb_ignore_builtin.test
 @@ -1,3 +1,7 @@
 +# For Percona Server this test is made a no-op, because ignore-builtin-innodb
 +# is checked at the server startup time and the server aborts with an error
@@ -192,9 +183,8 @@
  #
  # Bug #42610:  Dynamic plugin broken in 5.1.31
  #
-diff -ruN a/mysql-test/r/innodb_ignore_builtin.result b/mysql-test/r/innodb_ignore_builtin.result
---- a/mysql-test/r/innodb_ignore_builtin.result	2011-04-12 15:38:18.000000000 +0300
-+++ b/mysql-test/r/innodb_ignore_builtin.result	2011-06-20 08:40:10.545826001 +0300
+--- a/mysql-test/r/innodb_ignore_builtin.result
++++ b/mysql-test/r/innodb_ignore_builtin.result
 @@ -1,9 +1,11 @@
  show variables like 'ignore_builtin_innodb';
  Variable_name	Value

=== modified file 'patches/innodb_thread_concurrency_timer_based.patch'
--- patches/innodb_thread_concurrency_timer_based.patch	2011-06-23 02:18:22 +0000
+++ patches/innodb_thread_concurrency_timer_based.patch	2011-07-27 11:11:52 +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/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
---- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:43:16.000000000 +0900
-+++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 16:43:53.000000000 +0900
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
 @@ -151,6 +151,7 @@
  static ulong innobase_read_io_threads;
  static ulong innobase_write_io_threads;
@@ -47,9 +46,8 @@
    MYSQL_SYSVAR(thread_sleep_delay),
    MYSQL_SYSVAR(autoinc_lock_mode),
    MYSQL_SYSVAR(show_verbose_locks),
-diff -ruN a/storage/innodb_plugin/handler/innodb_patch_info.h b/storage/innodb_plugin/handler/innodb_patch_info.h
---- a/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:43:16.000000000 +0900
-+++ b/storage/innodb_plugin/handler/innodb_patch_info.h	2010-04-29 16:43:53.000000000 +0900
+--- a/storage/innodb_plugin/handler/innodb_patch_info.h
++++ b/storage/innodb_plugin/handler/innodb_patch_info.h
 @@ -31,5 +31,6 @@
  {"innodb_expand_undo_slots","expandable maximum number of undo slots","from 1024 (default) to about 4000","http://www.percona.com/docs/wiki/percona-xtradb"},
  {"innodb_extra_rseg","allow to create extra rollback segments","When create new db, the new parameter allows to create more rollback segments","http://www.percona.com/docs/wiki/percona-xtradb"},
@@ -57,9 +55,8 @@
 +{"innodb_thread_concurrency_timer_based","use InnoDB timer based concurrency throttling (backport from MySQL 5.4.0)","",""},
  {NULL, NULL, NULL, NULL}
  };
-diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
---- a/storage/innodb_plugin/include/srv0srv.h	2010-04-29 16:39:34.000000000 +0900
-+++ b/storage/innodb_plugin/include/srv0srv.h	2010-04-29 16:43:53.000000000 +0900
+--- a/storage/innodb_plugin/include/srv0srv.h
++++ b/storage/innodb_plugin/include/srv0srv.h
 @@ -147,6 +147,8 @@
  extern ulint	srv_mem_pool_size;
  extern ulint	srv_lock_table_size;
@@ -69,9 +66,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/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
---- a/storage/innodb_plugin/srv/srv0srv.c	2010-04-29 16:39:34.000000000 +0900
-+++ b/storage/innodb_plugin/srv/srv0srv.c	2010-04-29 16:43:53.000000000 +0900
+--- a/storage/innodb_plugin/srv/srv0srv.c
++++ b/storage/innodb_plugin/srv/srv0srv.c
 @@ -318,6 +318,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-06-23 02:18:22 +0000
+++ patches/log_connection_error.patch	2011-07-27 11:11:52 +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/mysql-test/r/connect.result b/mysql-test/r/connect.result
---- a/mysql-test/r/connect.result	2010-07-28 16:47:46.895318726 +0400
-+++ b/mysql-test/r/connect.result	2010-07-28 16:47:48.234134231 +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;
@@ -18,9 +17,8 @@
  # -- End of 5.1 tests
  # ------------------------------------------------------------------
 +set global log_warnings=1;
-diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test
---- a/mysql-test/t/connect.test	2010-07-28 16:47:46.865318816 +0400
-+++ b/mysql-test/t/connect.test	2010-07-28 16:47:48.057260581 +0400
+--- a/mysql-test/t/connect.test
++++ b/mysql-test/t/connect.test
 @@ -1,3 +1,5 @@
 +set global log_warnings=0;
 +
@@ -32,9 +30,8 @@
  --source include/wait_until_count_sessions.inc
  
 +set global log_warnings=1;
-diff -ruN a/patch_info/log_connection_error.patch b/patch_info/log_connection_error.patch
---- a/patch_info/log_connection_error.patch	1970-01-01 03:00:00.000000000 +0300
-+++ b/patch_info/log_connection_error.patch	2010-07-28 16:47:47.634070367 +0400
+--- /dev/null
++++ b/patch_info/log_connection_error.patch
 @@ -0,0 +1,6 @@
 +File=log_connection_error.patch
 +Name=logging abandoned connections
@@ -42,9 +39,8 @@
 +Author=Percona <[e-mail]>
 +License=GPL
 +Comment=
-diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-07-28 16:47:47.105319218 +0400
-+++ b/sql/mysqld.cc	2010-07-28 16:47:47.644101813 +0400
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
 @@ -5070,6 +5070,10 @@
  
      DBUG_PRINT("error",("Too many connections"));

=== modified file 'patches/microsec_process.patch'
--- patches/microsec_process.patch	2011-06-23 02:18:22 +0000
+++ patches/microsec_process.patch	2011-07-27 11:11:52 +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/patch_info/microsec_process.info b/patch_info/microsec_process.info
---- /dev/null	1970-01-01 09:00:00.000000000 +0900
-+++ b/patch_info/microsec_process.info	2010-08-27 14:45:52.941058849 +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-08-27 14:38:08.781057666 +0900
-+++ b/sql/sql_show.cc	2010-08-27 14:45:52.946058726 +0900
+--- a/sql/sql_show.cc
++++ b/sql/sql_show.cc
 @@ -1913,7 +1913,8 @@
    TABLE *table= tables->table;
    CHARSET_INFO *cs= system_charset_info;

=== modified file 'patches/mysql-syslog.patch'
--- patches/mysql-syslog.patch	2011-06-23 02:18:22 +0000
+++ patches/mysql-syslog.patch	2011-07-27 11:11:52 +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/client/client_priv.h b/client/client_priv.h
---- a/client/client_priv.h	2011-01-07 18:46:05.000000000 +0300
-+++ b/client/client_priv.h	2011-01-07 18:53:03.000000000 +0300
+--- a/client/client_priv.h
++++ b/client/client_priv.h
 @@ -91,6 +91,9 @@
    OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
    OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
@@ -18,9 +17,8 @@
    OPT_FIRST_SLAVE,
    OPT_ALL,
    OPT_MAX_CLIENT_OPTION
-diff -ruN a/client/mysql.cc b/client/mysql.cc
---- a/client/mysql.cc	2010-11-29 13:37:59.000000000 +0300
-+++ b/client/mysql.cc	2011-01-07 18:57:05.000000000 +0300
+--- a/client/mysql.cc
++++ b/client/mysql.cc
 @@ -43,6 +43,9 @@
  #include "my_readline.h"
  #include <signal.h>

=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff	2011-07-22 05:41:42 +0000
+++ patches/mysql-test.diff	2011-07-27 11:11:52 +0000
@@ -1,6 +1,5 @@
-diff -ruN a/mysql-test/include/index_merge2.inc b/mysql-test/include/index_merge2.inc
---- a/mysql-test/include/index_merge2.inc	2011-04-12 16:38:39.000000000 +0400
-+++ b/mysql-test/include/index_merge2.inc	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/include/index_merge2.inc
++++ b/mysql-test/include/index_merge2.inc
 @@ -122,12 +122,14 @@
  analyze table t1;
  select count(*) from t1;
@@ -16,9 +15,8 @@
  explain select count(*) from t1 where
    key1a = 2 and key1b is null and key3a = 2 and key3b is null;
  
-diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result
---- a/mysql-test/r/create.result	2011-04-12 16:38:08.000000000 +0400
-+++ b/mysql-test/r/create.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/create.result
++++ b/mysql-test/r/create.result
 @@ -1743,7 +1743,8 @@
    `COMMAND` varchar(16) NOT NULL DEFAULT '',
    `TIME` int(7) NOT NULL DEFAULT '0',
@@ -39,9 +37,8 @@
  ) ENGINE=MyISAM DEFAULT CHARSET=utf8
  drop table t1;
  create table t1 like information_schema.character_sets;
-diff -ruN a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result
---- a/mysql-test/r/index_merge_innodb.result	2011-04-12 16:38:17.000000000 +0400
-+++ b/mysql-test/r/index_merge_innodb.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/index_merge_innodb.result
++++ b/mysql-test/r/index_merge_innodb.result
 @@ -111,7 +111,7 @@
  explain select count(*) from t1 where
  key1a = 2 and key1b is null and  key2a = 2 and key2b is null;
@@ -60,9 +57,8 @@
  select count(*) from t1 where
  key1a = 2 and key1b is null and key3a = 2 and key3b is null;
  count(*)
-diff -ruN a/mysql-test/r/index_merge_myisam.result b/mysql-test/r/index_merge_myisam.result
---- a/mysql-test/r/index_merge_myisam.result	2011-04-12 16:38:17.000000000 +0400
-+++ b/mysql-test/r/index_merge_myisam.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/index_merge_myisam.result
++++ b/mysql-test/r/index_merge_myisam.result
 @@ -945,7 +945,7 @@
  explain select count(*) from t1 where
  key1a = 2 and key1b is null and  key2a = 2 and key2b is null;
@@ -81,9 +77,8 @@
  select count(*) from t1 where
  key1a = 2 and key1b is null and key3a = 2 and key3b is null;
  count(*)
-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-12 16:38:17.000000000 +0400
-+++ b/mysql-test/r/information_schema.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/information_schema.result
++++ b/mysql-test/r/information_schema.result
 @@ -44,14 +44,17 @@
  select * from v1;
  c
@@ -440,9 +435,8 @@
  create table t1(f1 int);
  create view v1 as select f1+1 as a from t1;
  create table t2 (f1 int, f2 int);
-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-12 16:38:17.000000000 +0400
-+++ b/mysql-test/r/information_schema_db.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/information_schema_db.result
++++ b/mysql-test/r/information_schema_db.result
 @@ -6,14 +6,17 @@
  show tables;
  Tables_in_information_schema
@@ -509,9 +503,8 @@
  TRIGGERS
  create database `inf%`;
  create database mbase;
-diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
---- a/mysql-test/r/mysqlshow.result	2011-04-12 16:38:22.000000000 +0400
-+++ b/mysql-test/r/mysqlshow.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/mysqlshow.result
++++ b/mysql-test/r/mysqlshow.result
 @@ -80,14 +80,17 @@
  |                Tables                 |
  +---------------------------------------+
@@ -627,9 +620,8 @@
  +---------------------------------------+
  Wildcard: inf_rmation_schema
  +--------------------+
-diff -ruN a/mysql-test/r/profiling.result b/mysql-test/r/profiling.result
---- a/mysql-test/r/profiling.result	2011-04-12 16:38:26.000000000 +0400
-+++ b/mysql-test/r/profiling.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/profiling.result
++++ b/mysql-test/r/profiling.result
 @@ -6,6 +6,8 @@
  Variable_name	Value
  profiling	OFF
@@ -656,9 +648,8 @@
  select @@profiling;
  @@profiling
  1
-diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result
---- a/mysql-test/r/select.result	2011-04-12 16:38:27.000000000 +0400
-+++ b/mysql-test/r/select.result	2011-06-30 22:22:08.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
@@ -672,9 +663,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/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
---- a/mysql-test/suite/innodb/r/innodb.result	2011-04-12 16:40:57.000000000 +0400
-+++ b/mysql-test/suite/innodb/r/innodb.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/r/innodb.result
++++ b/mysql-test/suite/innodb/r/innodb.result
 @@ -691,14 +691,16 @@
  select count(*) from t1 where sca_pic is null;
  count(*)
@@ -764,9 +754,8 @@
  show create table t1;
  Table	Create Table
  t1	CREATE TABLE `t1` (
-diff -ruN a/mysql-test/suite/innodb/r/innodb_bug44369.result b/mysql-test/suite/innodb/r/innodb_bug44369.result
---- a/mysql-test/suite/innodb/r/innodb_bug44369.result	2011-04-12 16:40:58.000000000 +0400
-+++ b/mysql-test/suite/innodb/r/innodb_bug44369.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/r/innodb_bug44369.result
++++ b/mysql-test/suite/innodb/r/innodb_bug44369.result
 @@ -1,14 +1,14 @@
  create table bug44369 (DB_ROW_ID int) engine=innodb;
 -ERROR HY000: Can't create table 'test.bug44369' (errno: -1)
@@ -787,9 +776,8 @@
 -Warning	1005	Error creating table 'test/bug44369' with column name 'db_TRX_Id'. 'db_TRX_Id' is a reserved name. Please try to re-create the table with a different column name.
 +Error	1166	Incorrect column name 'db_TRX_Id'
  Error	1005	Can't create table 'test.bug44369' (errno: -1)
-diff -ruN a/mysql-test/suite/innodb/r/innodb_bug46000.result b/mysql-test/suite/innodb/r/innodb_bug46000.result
---- a/mysql-test/suite/innodb/r/innodb_bug46000.result	2011-04-12 16:40:58.000000000 +0400
-+++ b/mysql-test/suite/innodb/r/innodb_bug46000.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/r/innodb_bug46000.result
++++ b/mysql-test/suite/innodb/r/innodb_bug46000.result
 @@ -1,17 +1,19 @@
  create table bug46000(`id` int,key `GEN_CLUST_INDEX`(`id`))engine=innodb;
 -ERROR HY000: Can't create table 'test.bug46000' (errno: -1)
@@ -816,9 +804,8 @@
 +Error	1030	Got error -1 from storage engine
  create index idx on bug46000(id);
  drop table bug46000;
-diff -ruN a/mysql-test/suite/innodb/r/innodb_misc1.result b/mysql-test/suite/innodb/r/innodb_misc1.result
---- a/mysql-test/suite/innodb/r/innodb_misc1.result	2011-04-12 16:40:59.000000000 +0400
-+++ b/mysql-test/suite/innodb/r/innodb_misc1.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/r/innodb_misc1.result
++++ b/mysql-test/suite/innodb/r/innodb_misc1.result
 @@ -659,7 +659,7 @@
  commit;
  drop table t1, t2, t3, t5, t6, t8, t9;
@@ -836,9 +823,8 @@
  CREATE TABLE t1 (
  c01 CHAR(255), c02 CHAR(255), c03 CHAR(255), c04 CHAR(255),
  c05 CHAR(255), c06 CHAR(255), c07 CHAR(255), c08 CHAR(255),
-diff -ruN a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
---- a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test	2011-04-12 16:40:54.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
++++ b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
 @@ -6,6 +6,8 @@
  drop table if exists t1;
  --enable_warnings
@@ -855,9 +841,8 @@
 +
 +-- disable_query_log
 +eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;
-diff -ruN a/mysql-test/suite/innodb/t/innodb-autoinc.test b/mysql-test/suite/innodb/t/innodb-autoinc.test
---- a/mysql-test/suite/innodb/t/innodb-autoinc.test	2011-04-12 16:40:54.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb-autoinc.test	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb-autoinc.test
++++ b/mysql-test/suite/innodb/t/innodb-autoinc.test
 @@ -6,6 +6,8 @@
  drop table if exists t1;
  --enable_warnings
@@ -874,9 +859,8 @@
 +
 +-- disable_query_log
 +eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;
-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-04-12 16:40:54.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb.test	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb.test
++++ b/mysql-test/suite/innodb/t/innodb.test
 @@ -427,11 +427,13 @@
  select count(*) from t1 where sca_code = 'PD';
  select count(*) from t1 where sca_code <= 'PD';
@@ -926,9 +910,8 @@
  
  # Test for innodb_thread_concurrency variable
  SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency;
-diff -ruN a/mysql-test/suite/innodb/t/innodb_bug44369.test b/mysql-test/suite/innodb/t/innodb_bug44369.test
---- a/mysql-test/suite/innodb/t/innodb_bug44369.test	2011-04-12 16:40:55.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb_bug44369.test	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb_bug44369.test
++++ b/mysql-test/suite/innodb/t/innodb_bug44369.test
 @@ -6,16 +6,16 @@
  --source include/have_innodb.inc
  
@@ -949,9 +932,8 @@
  create table bug44369 (db_TRX_Id int) engine=innodb;
  
  show warnings;
-diff -ruN a/mysql-test/suite/innodb/t/innodb_bug46000.test b/mysql-test/suite/innodb/t/innodb_bug46000.test
---- a/mysql-test/suite/innodb/t/innodb_bug46000.test	2011-04-12 16:40:55.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb_bug46000.test	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb_bug46000.test
++++ b/mysql-test/suite/innodb/t/innodb_bug46000.test
 @@ -7,11 +7,11 @@
  
  # This 'create table' operation should fail because of
@@ -975,9 +957,8 @@
  create index GEN_CLUST_INDEX on bug46000(id);
  
  --replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/
-diff -ruN a/mysql-test/suite/innodb/t/innodb_misc1.test b/mysql-test/suite/innodb/t/innodb_misc1.test
---- a/mysql-test/suite/innodb/t/innodb_misc1.test	2011-04-12 16:40:56.000000000 +0400
-+++ b/mysql-test/suite/innodb/t/innodb_misc1.test	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/innodb/t/innodb_misc1.test
++++ b/mysql-test/suite/innodb/t/innodb_misc1.test
 @@ -904,7 +904,7 @@
  drop table t1, t2, t3, t5, t6, t8, t9;
  
@@ -996,9 +977,8 @@
  --error 1118
  CREATE TABLE t1 (
  	c01 CHAR(255), c02 CHAR(255), c03 CHAR(255), c04 CHAR(255),
-diff -ruN a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
---- a/mysql-test/r/query_cache.result	2011-04-12 16:38:26.000000000 +0400
-+++ b/mysql-test/r/query_cache.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/r/query_cache.result
++++ b/mysql-test/r/query_cache.result
 @@ -1708,20 +1708,3 @@
  DROP TABLE t1;
  SET GLOBAL query_cache_size= default;
@@ -1020,9 +1000,8 @@
 -DROP TABLE t1;
 -SET GLOBAL query_cache_size= default;
 -End of 5.1 tests
-diff -ruN a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
---- a/mysql-test/t/query_cache.test	2011-04-12 16:37:57.000000000 +0400
-+++ b/mysql-test/t/query_cache.test	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/t/query_cache.test
++++ b/mysql-test/t/query_cache.test
 @@ -1289,23 +1289,3 @@
  SET GLOBAL query_cache_size= default;
  
@@ -1047,9 +1026,8 @@
 -
 ---echo End of 5.1 tests
 -
-diff -ruN a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result
---- a/mysql-test/suite/funcs_1/r/is_columns_is.result	2011-04-12 16:39:10.000000000 +0400
-+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/funcs_1/r/is_columns_is.result
++++ b/mysql-test/suite/funcs_1/r/is_columns_is.result
 @@ -7,6 +7,27 @@
  NULL	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME	2		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
  NULL	information_schema	CHARACTER_SETS	DESCRIPTION	3		NO	varchar	60	180	NULL	NULL	utf8	utf8_general_ci	varchar(60)			select	
@@ -1560,9 +1538,8 @@
 +3.0000	information_schema	XTRADB_ENHANCEMENTS	description	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 +3.0000	information_schema	XTRADB_ENHANCEMENTS	comment	varchar	100	300	utf8	utf8_general_ci	varchar(100)
 +3.0000	information_schema	XTRADB_ENHANCEMENTS	link	varchar	255	765	utf8	utf8_general_ci	varchar(255)
-diff -ruN a/mysql-test/suite/funcs_1/r/is_engines_innodb.result b/mysql-test/suite/funcs_1/r/is_engines_innodb.result
---- a/mysql-test/suite/funcs_1/r/is_engines_innodb.result	2011-04-12 16:39:11.000000000 +0400
-+++ b/mysql-test/suite/funcs_1/r/is_engines_innodb.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/funcs_1/r/is_engines_innodb.result
++++ b/mysql-test/suite/funcs_1/r/is_engines_innodb.result
 @@ -2,7 +2,7 @@
  WHERE ENGINE = 'InnoDB';
  ENGINE	InnoDB
@@ -1572,9 +1549,8 @@
  TRANSACTIONS	YES
  XA	YES
  SAVEPOINTS	YES
-diff -ruN a/mysql-test/suite/funcs_1/r/is_tables_is.result b/mysql-test/suite/funcs_1/r/is_tables_is.result
---- a/mysql-test/suite/funcs_1/r/is_tables_is.result	2011-04-12 16:39:12.000000000 +0400
-+++ b/mysql-test/suite/funcs_1/r/is_tables_is.result	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/funcs_1/r/is_tables_is.result
++++ b/mysql-test/suite/funcs_1/r/is_tables_is.result
 @@ -38,6 +38,29 @@
  Separator	-----------------------------------------------------
  TABLE_CATALOG	NULL
@@ -3300,9 +3276,8 @@
  # Switch to connection default and close connection testuser1
  DROP USER testuser1@localhost;
  DROP DATABASE test1;
-diff -ruN a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
---- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc	2011-04-12 16:39:25.000000000 +0400
-+++ b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc	2011-06-30 22:22:08.000000000 +0400
+--- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
++++ b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
 @@ -66,7 +66,7 @@
  let $table= processlist;