Merge lp:~tsarev/percona-server/5.5.19 into lp:percona-server/5.5

[Oleg Tsarev]

Porting to 5.5.19
1) removed mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt, incorrect setup of innodb-buffer-pool-size (according to innodb_io_patches min value changed to 32M)
2) Changed logic of MYSQL_BIN_LOG::trx_group_commit_leader related to changed in 5.5.19 logic of work with mutex LOCK_log
3) Little changes in percona_server_variables_{debug|release}

[Oleg Tsarev (tsarev)]

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/248/

[Laurynas Biveinis (laurynas-biveinis)]

Jenkins results show 320 failures, I think that's way too much to merge even if it's all Jenkins trouble, and that's even with Oneiric not having their regular failures. Can you restart the job to get better results?

review: Needs Fixing

[Stewart Smith (stewart)]

I restarted job, merged with latest fixes and going through merge proposal of my branch (which passes better than trunk).... i.e. setting this one to approved too.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2011-12-05 08:44:44 +0000
+++ Makefile	2011-12-29 02:23:24 +0000
@@ -1,6 +1,6 @@
 FETCH_CMD=wget
 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
-MYSQL_VERSION=5.5.18
+MYSQL_VERSION=5.5.19
 PERCONA_SERVER_VERSION=rel21.0
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)

=== modified file 'patches/bug860910.patch'
--- patches/bug860910.patch	2011-12-13 13:49:04 +0000
+++ patches/bug860910.patch	2011-12-29 02:23:24 +0000
@@ -77,7 +77,7 @@
 +--source include/rpl_end.inc
 --- a/sql/log.cc
 +++ b/sql/log.cc
-@@ -5079,6 +5079,12 @@
+@@ -5076,6 +5076,12 @@
                                   user_var_event->type,
                                   user_var_event->charset_number,
                                   flags);

=== modified file 'patches/control_online_alter_index.patch'
--- patches/control_online_alter_index.patch	2011-08-09 20:52:20 +0000
+++ patches/control_online_alter_index.patch	2011-12-29 02:23:24 +0000
@@ -18,7 +18,7 @@
    supported at all.
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -481,6 +481,8 @@
+@@ -479,6 +479,8 @@
    my_bool engine_condition_pushdown;
    my_bool keep_files_on_create;
  
@@ -45,7 +45,7 @@
        goto err;
 --- a/sql/sql_table.cc
 +++ b/sql/sql_table.cc
-@@ -6140,6 +6140,10 @@
+@@ -6146,6 +6146,10 @@
      uint  *idx_end_p;
  
      alter_flags= table->file->alter_table_flags(alter_info->flags);
@@ -58,7 +58,7 @@
      for (idx_p= index_drop_buffer, idx_end_p= idx_p + index_drop_count;
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -2186,6 +2186,13 @@
+@@ -2192,6 +2192,13 @@
         GLOBAL_VAR(opt_optimizer_fix),
         NO_CMD_LINE, DEFAULT(TRUE));
  

=== modified file 'patches/group_commit.patch'
--- patches/group_commit.patch	2011-12-15 07:49:37 +0000
+++ patches/group_commit.patch	2011-12-29 02:23:24 +0000
@@ -282,15 +282,7 @@
     int  (*recover)(handlerton *hton, XID *xid_list, uint len);
 --- a/sql/log.cc
 +++ b/sql/log.cc
-@@ -49,6 +49,7 @@
- 
- #include "sql_plugin.h"
- #include "rpl_handler.h"
-+#include "debug_sync.h"
- 
- /* max size of the log message */
- #define MAX_LOG_BUFFER_SIZE 1024
-@@ -71,6 +72,25 @@
+@@ -71,6 +71,25 @@
  static int binlog_rollback(handlerton *hton, THD *thd, bool all);
  static int binlog_prepare(handlerton *hton, THD *thd, bool all);
  
@@ -316,7 +308,7 @@
  /**
     purge logs, master and slave sides both, related error code
     convertor.
-@@ -167,41 +187,6 @@
+@@ -167,41 +186,6 @@
  }
  
  /*
@@ -358,7 +350,7 @@
    Helper classes to store non-transactional and transactional data
    before copying it to the binary log.
  */
-@@ -211,7 +196,8 @@
+@@ -211,7 +195,8 @@
    binlog_cache_data(): m_pending(0), before_stmt_pos(MY_OFF_T_UNDEF),
    incident(FALSE), changes_to_non_trans_temp_table_flag(FALSE),
    saved_max_binlog_cache_size(0), ptr_binlog_cache_use(0),
@@ -368,7 +360,7 @@
    { }
    
    ~binlog_cache_data()
-@@ -270,6 +256,8 @@
+@@ -270,6 +255,8 @@
        variable after truncating the cache.
      */
      cache_log.disk_writes= 0;
@@ -377,7 +369,7 @@
      DBUG_ASSERT(empty());
    }
  
-@@ -411,6 +399,20 @@
+@@ -411,6 +398,20 @@
   
    binlog_cache_data& operator=(const binlog_cache_data& info);
    binlog_cache_data(const binlog_cache_data& info);
@@ -398,7 +390,7 @@
  };
  
  class binlog_cache_mngr {
-@@ -1627,7 +1629,7 @@
+@@ -1624,7 +1625,7 @@
  */
  static inline int
  binlog_flush_cache(THD *thd, binlog_cache_data* cache_data, Log_event *end_evt,
@@ -407,7 +399,7 @@
  {
    DBUG_ENTER("binlog_flush_cache");
    int error= 0;
-@@ -1646,8 +1648,8 @@
+@@ -1643,8 +1644,8 @@
        were, we would have to ensure that we're not ending a statement
        inside a stored function.
      */
@@ -418,7 +410,7 @@
    }
    cache_data->reset();
  
-@@ -1666,12 +1668,12 @@
+@@ -1663,12 +1664,12 @@
  */
  static inline int
  binlog_commit_flush_stmt_cache(THD *thd,
@@ -433,7 +425,7 @@
  }
  
  /**
-@@ -1684,12 +1686,12 @@
+@@ -1681,12 +1682,12 @@
      nonzero if an error pops up when flushing the cache.
  */
  static inline int
@@ -448,7 +440,7 @@
  }
  
  /**
-@@ -1702,12 +1704,12 @@
+@@ -1699,12 +1700,12 @@
      nonzero if an error pops up when flushing the cache.
  */
  static inline int
@@ -463,7 +455,7 @@
  }
  
  /**
-@@ -1722,11 +1724,11 @@
+@@ -1719,11 +1720,11 @@
  */
  static inline int
  binlog_commit_flush_trx_cache(THD *thd, binlog_cache_mngr *cache_mngr,
@@ -477,7 +469,7 @@
  }
  
  /**
-@@ -1788,7 +1790,7 @@
+@@ -1785,7 +1786,7 @@
      do nothing.
      just pretend we can do 2pc, so that MySQL won't
      switch to 1pc.
@@ -486,7 +478,7 @@
    */
    return 0;
  }
-@@ -1821,7 +1823,7 @@
+@@ -1818,7 +1819,7 @@
  
    if (!cache_mngr->stmt_cache.empty())
    {
@@ -495,7 +487,7 @@
    }
  
    if (cache_mngr->trx_cache.empty())
-@@ -1840,7 +1842,7 @@
+@@ -1837,7 +1838,7 @@
      Otherwise, we accumulate the changes.
    */
    if (!error && ending_trans(thd, all))
@@ -504,7 +496,7 @@
  
    /*
      This is part of the stmt rollback.
-@@ -1884,7 +1886,7 @@
+@@ -1881,7 +1882,7 @@
    }
    else if (!cache_mngr->stmt_cache.empty())
    {
@@ -513,7 +505,7 @@
    }
  
    if (cache_mngr->trx_cache.empty())
-@@ -1932,7 +1934,7 @@
+@@ -1929,7 +1930,7 @@
           (trans_has_updated_non_trans_table(thd) &&
            ending_single_stmt_trans(thd,all) &&
            thd->variables.binlog_format == BINLOG_FORMAT_MIXED)))
@@ -522,7 +514,7 @@
      /*
        Truncate the cache if:
          . aborting a single or multi-statement transaction or;
-@@ -2907,6 +2909,7 @@
+@@ -2904,6 +2905,7 @@
  MYSQL_BIN_LOG::MYSQL_BIN_LOG(uint *sync_period)
    :bytes_written(0), prepared_xids(0), file_id(1), open_count(1),
     need_start_event(TRUE),
@@ -530,7 +522,7 @@
     sync_period_ptr(sync_period),
     is_relay_log(0), signal_cnt(0),
     description_event_for_exec(0), description_event_for_queue(0)
-@@ -5279,19 +5282,15 @@
+@@ -5325,19 +5327,15 @@
    SYNOPSIS
      write_cache()
      cache    Cache to write to the binary log
@@ -552,7 +544,7 @@
    if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0))
      return ER_ERROR_ON_WRITE;
    uint length= my_b_bytes_in_cache(cache), group, carry, hdr_offs;
-@@ -5402,6 +5401,8 @@
+@@ -5448,6 +5446,8 @@
      }
  
      /* Write data to the binary log file */
@@ -561,7 +553,7 @@
      if (my_b_write(&log_file, cache->read_pos, length))
        return ER_ERROR_ON_WRITE;
      thd->binlog_bytes_written+= length;
-@@ -5410,9 +5411,6 @@
+@@ -5456,9 +5456,6 @@
  
    DBUG_ASSERT(carry == 0);
  
@@ -571,7 +563,7 @@
    return 0;                                     // All OK
  }
  
-@@ -5453,8 +5451,6 @@
+@@ -5499,8 +5496,6 @@
    if (!is_open())
      DBUG_RETURN(error);
  
@@ -580,7 +572,7 @@
    Incident incident= INCIDENT_LOST_EVENTS;
    Incident_log_event ev(thd, incident, write_error_msg);
    if (lock)
-@@ -5496,104 +5492,320 @@
+@@ -5549,112 +5544,332 @@
      'cache' needs to be reinitialized after this functions returns.
  */
  
@@ -589,8 +581,7 @@
 +bool
 +MYSQL_BIN_LOG::write_transaction_to_binlog(THD *thd, binlog_cache_data *cache_data,
 +                                           Log_event *end_ev, bool all)
- {
--  DBUG_ENTER("MYSQL_BIN_LOG::write(THD *, IO_CACHE *, Log_event *)");
++{
 +  group_commit_entry entry;
 +  bool ret;
 +  DBUG_ENTER("MYSQL_BIN_LOG::write_transaction_to_binlog");
@@ -631,7 +622,8 @@
 +
 +bool
 +MYSQL_BIN_LOG::write_transaction_to_binlog_events(group_commit_entry *entry)
-+{
+ {
+-  DBUG_ENTER("MYSQL_BIN_LOG::write(THD *, IO_CACHE *, Log_event *)");
 +  /*
 +    To facilitate group commit for the binlog, we first queue up ourselves in
 +    the group commit queue. Then the first thread to enter the queue waits for
@@ -678,7 +670,7 @@
 +                    "Error writing transaction to binary log: %d",
 +                    MYF(ME_NOREFRESH), entry->error);
 +  }
-+
+ 
 +  /*
 +    Since we return error, this transaction XID will not be committed, so
 +    we need to mark it as not needed for recovery (unlog() is not called
@@ -706,38 +698,42 @@
 +  DBUG_ENTER("MYSQL_BIN_LOG::trx_group_commit_leader");
 +  uint xid_count= 0;
 +  uint write_count= 0;
-+
-+  /*
-+    Lock the LOCK_log(), and once we get it, collect any additional writes
-+    that queued up while we were waiting.
-+  */
-   mysql_mutex_lock(&LOCK_log);
-+  DEBUG_SYNC(leader->thd, "commit_after_get_LOCK_log");
-+  mysql_mutex_lock(&LOCK_group_commit_queue);
-+  group_commit_entry *current= group_commit_queue;
-+  group_commit_queue= NULL;
-+  mysql_mutex_unlock(&LOCK_group_commit_queue);
-+
-+  /* As the queue is in reverse order of entering, reverse it. */
-+  group_commit_entry *queue= NULL;
-+  while (current)
-+  {
-+    group_commit_entry *next= current->next;
-+    current->next= queue;
-+    queue= current;
-+    current= next;
-+  }
-+  DBUG_ASSERT(leader == queue /* the leader should be first in queue */);
- 
-+  /* Now we have in queue the list of transactions to be committed in order. */
++  bool check_purge= false;
++  group_commit_entry *current= 0;
    DBUG_ASSERT(is_open());
    if (likely(is_open()))                       // Should always be true
    {
+-    bool check_purge;
+-    
++    /*
++      Lock the LOCK_log(), and once we get it, collect any additional writes
++      that queued up while we were waiting.
++    */
+     mysql_mutex_lock(&LOCK_log);
++
++    DEBUG_SYNC(leader->thd, "commit_after_get_LOCK_log");
++    mysql_mutex_lock(&LOCK_group_commit_queue);
++    current= group_commit_queue;
++    group_commit_queue= NULL;
++    mysql_mutex_unlock(&LOCK_group_commit_queue);
++
++    /* As the queue is in reverse order of entering, reverse it. */
++    group_commit_entry *queue= NULL;
++    while (current)
++    {
++      group_commit_entry *next= current->next;
++      current->next= queue;
++      queue= current;
++      current= next;
++    }
++    DBUG_ASSERT(leader == queue /* the leader should be first in queue */);
      /*
 -      We only bother to write to the binary log if there is anything
 -      to write.
 -     */
 -    if (my_b_tell(cache) > 0)
++      Now we have in queue the list of transactions to be committed in order.
++
 +      Commit every transaction in the queue.
 +
 +      Note that we are doing this in a different thread than the one running
@@ -771,28 +767,28 @@
 -                        DBUG_PRINT("info", ("crashing before writing xid"));
 -                        DBUG_SUICIDE();
 -                      });
+-
+-      if ((write_error= write_cache(thd, cache, false, false)))
+-        goto err;
+-
+-      if (commit_event && commit_event->write(&log_file))
+-        goto err;
+-      if (commit_event)
+-        thd->binlog_bytes_written+= commit_event->data_written;
 +      if (my_b_tell(cache) > 0)
 +      {
 +        if ((current->error= write_transaction(current)))
 +          current->commit_errno= errno;
- 
--      if ((write_error= write_cache(thd, cache, false, false)))
--        goto err;
 +        write_count++;
 +      }
  
--      if (commit_event && commit_event->write(&log_file))
+-      if (incident && write_incident(thd, FALSE))
 -        goto err;
--      if (commit_event)
--        thd->binlog_bytes_written+= commit_event->data_written;
 +      cache_data->commit_bin_log_file_pos= my_b_write_tell(&log_file);
 +      if (cache_data->using_xa && cache_data->xa_xid)
 +        xid_count++;
 +    }
  
--      if (incident && write_incident(thd, FALSE))
--        goto err;
- 
 +    if (write_count > 0)
 +    {
        bool synced= 0;
@@ -856,11 +852,16 @@
 -      mysql_mutex_lock(&LOCK_prep_xids);
 -      prepared_xids++;
 -      mysql_mutex_unlock(&LOCK_prep_xids);
+-      mysql_mutex_unlock(&LOCK_log);
 +      mark_xids_active(xid_count);
      }
      else
-       if (rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED))
+     {
+       if (rotate(false, &check_purge))
 -        goto err;
+-      mysql_mutex_unlock(&LOCK_log);
+-      if (check_purge) 
+-        purge();
 +      {
 +        for (current= queue; current != NULL; current= current->next)
 +        {
@@ -871,56 +872,67 @@
 +          }
 +        }
 +      }
-   }
-+  DEBUG_SYNC(leader->thd, "commit_before_get_LOCK_commit_ordered");
-+  mysql_mutex_lock(&LOCK_commit_ordered);
-+  /*
-+    We cannot unlock LOCK_log until we have locked LOCK_commit_ordered;
-+    otherwise scheduling could allow the next group commit to run ahead of us,
-+    messing up the order of commit_ordered() calls. But as soon as
-+    LOCK_commit_ordered is obtained, we can let the next group commit start.
-+  */
-   mysql_mutex_unlock(&LOCK_log);
-+  DEBUG_SYNC(leader->thd, "commit_after_release_LOCK_log");
-+  ++num_group_commits;
+     }
+-  }
  
 -  DBUG_RETURN(0);
--
++    DEBUG_SYNC(leader->thd, "commit_before_get_LOCK_commit_ordered");
++    mysql_mutex_lock(&LOCK_commit_ordered);
++    /*
++      We cannot unlock LOCK_log until we have locked LOCK_commit_ordered;
++      otherwise scheduling could allow the next group commit to run ahead of us,
++      messing up the order of commit_ordered() calls. But as soon as
++      LOCK_commit_ordered is obtained, we can let the next group commit start.
++    */
+ 
 -err:
 -  if (!write_error)
-+  /*
-+    Wakeup each participant waiting for our group commit, first calling the
-+    commit_ordered() methods for any transactions doing 2-phase commit.
-+  */
-+  current= queue;
-+  while (current != NULL)
-   {
+-  {
 -    write_error= 1;
 -    sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
-+    group_commit_entry *next;
-+
-+    DEBUG_SYNC(leader->thd, "commit_loop_entry_commit_ordered");
-+    ++num_commits;
-+    if (current->cache_data->using_xa && !current->error)
-+      run_commit_ordered(current->thd, current->all);
++    mysql_mutex_unlock(&LOCK_log);
++
++    if (xid_count > 0 && check_purge)
++    {
++      purge();
++    }
++
++    DEBUG_SYNC(leader->thd, "commit_after_release_LOCK_log");
++    ++num_group_commits;
 +
 +    /*
-+      Careful not to access current->next after waking up the other thread! As
-+      it may change immediately after wakeup.
++      Wakeup each participant waiting for our group commit, first calling the
++      commit_ordered() methods for any transactions doing 2-phase commit.
 +    */
-+    next= current->next;
-+    if (current != leader)                      // Don't wake up ourself
-+      current->thd->signal_wakeup_ready();
-+    current= next;
++    current= queue;
++    while (current != NULL)
++    {
++      group_commit_entry *next;
++
++      DEBUG_SYNC(leader->thd, "commit_loop_entry_commit_ordered");
++      ++num_commits;
++      if (current->cache_data->using_xa && !current->error)
++        run_commit_ordered(current->thd, current->all);
++
++      /*
++        Careful not to access current->next after waking up the other thread! As
++        it may change immediately after wakeup.
++      */
++      next= current->next;
++      if (current != leader)                      // Don't wake up ourself
++        current->thd->signal_wakeup_ready();
++      current= next;
++    }
++    DEBUG_SYNC(leader->thd, "commit_after_group_run_commit_ordered");
++    mysql_mutex_unlock(&LOCK_commit_ordered);
    }
 -  mysql_mutex_unlock(&LOCK_log);
 -  DBUG_RETURN(1);
-+  DEBUG_SYNC(leader->thd, "commit_after_group_run_commit_ordered");
-+  mysql_mutex_unlock(&LOCK_commit_ordered);
 +
 +  DBUG_VOID_RETURN;
  }
  
+ 
 +int
 +MYSQL_BIN_LOG::write_transaction(group_commit_entry *entry)
 +{
@@ -955,10 +967,11 @@
 +
 +  return 0;
 +}
- 
++
  /**
    Wait until we get a signal that the relay log has been updated.
-@@ -5999,6 +6211,68 @@
+ 
+@@ -6059,6 +6274,68 @@
  }
  
  
@@ -1027,7 +1040,7 @@
  /********* transaction coordinator log for 2pc - mmap() based solution *******/
  
  /*
-@@ -6135,6 +6409,7 @@
+@@ -6195,6 +6472,7 @@
    mysql_mutex_init(key_LOCK_pool, &LOCK_pool, MY_MUTEX_INIT_FAST);
    mysql_cond_init(key_COND_active, &COND_active, 0);
    mysql_cond_init(key_COND_pool, &COND_pool, 0);
@@ -1035,7 +1048,7 @@
  
    inited=6;
  
-@@ -6142,6 +6417,8 @@
+@@ -6202,6 +6480,8 @@
    active=pages;
    pool=pages+1;
    pool_last=pages+npages-1;
@@ -1044,7 +1057,7 @@
  
    return 0;
  
-@@ -6247,7 +6524,7 @@
+@@ -6307,7 +6587,7 @@
      to the position in memory where xid was logged to.
  */
  
@@ -1053,7 +1066,7 @@
  {
    int err;
    PAGE *p;
-@@ -6386,7 +6663,9 @@
+@@ -6446,7 +6726,9 @@
      mysql_mutex_destroy(&LOCK_sync);
      mysql_mutex_destroy(&LOCK_active);
      mysql_mutex_destroy(&LOCK_pool);
@@ -1063,7 +1076,7 @@
    case 5:
      data[0]='A'; // garble the first (signature) byte, in case mysql_file_delete fails
    case 4:
-@@ -6596,42 +6875,87 @@
+@@ -6656,42 +6938,87 @@
    mysql_cond_destroy(&COND_prep_xids);
  }
  
@@ -1163,7 +1176,7 @@
  }
  
  int TC_LOG_BINLOG::recover(IO_CACHE *log, Format_description_log_event *fdle)
-@@ -6700,9 +7024,67 @@
+@@ -6760,9 +7087,67 @@
  {
    return (ulonglong) mysql_bin_log.get_log_file()->pos_in_file;
  }
@@ -1231,7 +1244,7 @@
  struct st_mysql_storage_engine binlog_storage_engine=
  { MYSQL_HANDLERTON_INTERFACE_VERSION };
  
-@@ -6717,7 +7099,7 @@
+@@ -6777,7 +7162,7 @@
    binlog_init, /* Plugin Init */
    NULL, /* Plugin Deinit */
    0x0100 /* 1.0 */,
@@ -1423,7 +1436,7 @@
    void set_write_error(THD *thd, bool is_transactional);
    bool check_write_error(THD *thd);
  
-@@ -507,6 +595,7 @@
+@@ -509,6 +597,7 @@
    inline void unlock_index() { mysql_mutex_unlock(&LOCK_index);}
    inline IO_CACHE *get_index_file() { return &index_file;}
    inline uint32 get_open_count() { return open_count; }
@@ -1521,7 +1534,7 @@
    key_thread_handle_manager, key_thread_kill_server, key_thread_main,
 --- a/sql/sql_class.cc
 +++ b/sql/sql_class.cc
-@@ -912,6 +912,8 @@
+@@ -1005,6 +1005,8 @@
    mysql_mutex_init(key_LOCK_thd_data, &LOCK_thd_data, MY_MUTEX_INIT_FAST);
    mysql_mutex_init(key_LOCK_temporary_tables, &LOCK_temporary_tables,
                     MY_MUTEX_INIT_FAST);
@@ -1530,7 +1543,7 @@
  
    /* Variables with default values */
    proc_info="login";
-@@ -1516,6 +1518,8 @@
+@@ -1609,6 +1611,8 @@
    my_free(db);
    db= NULL;
    free_root(&transaction.mem_root,MYF(0));
@@ -1539,7 +1552,7 @@
    mysql_mutex_destroy(&LOCK_thd_data);
    mysql_mutex_destroy(&LOCK_temporary_tables);
  #ifndef DBUG_OFF
-@@ -5199,6 +5203,24 @@
+@@ -5292,6 +5296,24 @@
    DBUG_RETURN(0);
  }
  
@@ -1566,7 +1579,7 @@
  {
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -3017,6 +3017,14 @@
+@@ -3078,6 +3078,14 @@
    LEX_STRING get_invoker_user() { return invoker_user; }
    LEX_STRING get_invoker_host() { return invoker_host; }
    bool has_invoker() { return invoker_user.length > 0; }
@@ -1581,7 +1594,7 @@
  private:
  
    /** The current internal error handler for this thread, or NULL. */
-@@ -3059,6 +3067,16 @@
+@@ -3120,6 +3128,16 @@
     */
    LEX_STRING invoker_user;
    LEX_STRING invoker_host;
@@ -1874,7 +1887,7 @@
    
  		trx_deregister_from_2pc(trx);
  
-@@ -10973,6 +11140,7 @@
+@@ -10982,6 +11149,7 @@
  
  	srv_active_wake_master_thread();
  
@@ -1882,7 +1895,7 @@
  	if (thd_sql_command(thd) != SQLCOM_XA_PREPARE
  	    && (all
  		|| !thd_test_options(
-@@ -10999,6 +11167,7 @@
+@@ -11008,6 +11176,7 @@
  		mysql_mutex_lock(&prepare_commit_mutex);
  		trx_owns_prepare_commit_mutex_set(trx);
  	}

=== modified file 'patches/innodb_adaptive_hash_index_partitions.patch'
--- patches/innodb_adaptive_hash_index_partitions.patch	2011-12-13 05:54:15 +0000
+++ patches/innodb_adaptive_hash_index_partitions.patch	2011-12-29 02:23:24 +0000
@@ -81,7 +81,7 @@
  
 --- a/storage/innobase/btr/btr0cur.c
 +++ b/storage/innobase/btr/btr0cur.c
-@@ -502,7 +502,7 @@
+@@ -500,7 +500,7 @@
  #ifdef UNIV_SEARCH_PERF_STAT
  	info->n_searches++;
  #endif
@@ -90,7 +90,7 @@
  	    && latch_mode <= BTR_MODIFY_LEAF
  	    && info->last_hash_succ
  	    && !estimate
-@@ -538,7 +538,7 @@
+@@ -536,7 +536,7 @@
  
  	if (has_search_latch) {
  		/* Release possible search latch to obey latching order */
@@ -99,7 +99,7 @@
  	}
  
  	/* Store the position of the tree latch we push to mtr so that we
-@@ -862,7 +862,7 @@
+@@ -847,7 +847,7 @@
  
  	if (has_search_latch) {
  
@@ -108,7 +108,7 @@
  	}
  }
  
-@@ -1992,13 +1992,13 @@
+@@ -1977,13 +1977,13 @@
  			btr_search_update_hash_on_delete(cursor);
  		}
  
@@ -946,7 +946,7 @@
  	}
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -950,6 +950,7 @@
+@@ -960,6 +960,7 @@
  
  	block->check_index_page_at_flush = FALSE;
  	block->index = NULL;
@@ -954,7 +954,7 @@
  
  #ifdef UNIV_DEBUG
  	block->page.in_page_hash = FALSE;
-@@ -1392,7 +1393,11 @@
+@@ -1427,7 +1428,11 @@
  	ulint	p;
  
  #ifdef UNIV_SYNC_DEBUG
@@ -967,7 +967,7 @@
  #endif /* UNIV_SYNC_DEBUG */
  	ut_ad(!btr_search_enabled);
  
-@@ -2107,6 +2112,7 @@
+@@ -2142,6 +2147,7 @@
  {
  	block->check_index_page_at_flush = FALSE;
  	block->index		= NULL;
@@ -1029,7 +1029,7 @@
  		}
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11824,6 +11824,11 @@
+@@ -11833,6 +11833,11 @@
    "Disable with --skip-innodb-adaptive-hash-index.",
    NULL, innodb_adaptive_hash_index_update, TRUE);
  
@@ -1041,7 +1041,7 @@
  static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
    PLUGIN_VAR_RQCMDARG,
    "Replication thread delay (ms) on the slave server if "
-@@ -12204,6 +12209,7 @@
+@@ -12213,6 +12218,7 @@
    MYSQL_SYSVAR(use_sys_stats_table),
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),

=== modified file 'patches/innodb_admin_command_base.patch'
--- patches/innodb_admin_command_base.patch	2011-12-13 15:06:50 +0000
+++ patches/innodb_admin_command_base.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11990,7 +11990,8 @@
+@@ -11999,7 +11999,8 @@
  i_s_innodb_sys_foreign_cols,
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
@@ -186,7 +186,7 @@
 +select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_HELLO*/;
 --- a/mysql-test/r/mysqld--help-notwin.result
 +++ b/mysql-test/r/mysqld--help-notwin.result
-@@ -731,6 +731,10 @@
+@@ -733,6 +733,10 @@
   -V, --version       Output version information and exit.
   --wait-timeout=#    The number of seconds the server waits for activity on a
   connection before closing it
@@ -197,7 +197,7 @@
  
  Variables (--variable-name=value)
  abort-slave-event-count 0
-@@ -955,6 +959,7 @@
+@@ -958,6 +962,7 @@
  updatable-views-with-limit YES
  verbose TRUE
  wait-timeout 28800

=== modified file 'patches/innodb_buffer_pool_pages_i_s.patch'
--- patches/innodb_buffer_pool_pages_i_s.patch	2011-12-16 09:37:26 +0000
+++ patches/innodb_buffer_pool_pages_i_s.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -4126,6 +4126,36 @@
+@@ -4161,6 +4161,36 @@
  	mutex_exit(block_mutex);
  }
  
@@ -46,7 +46,7 @@
  @return	TRUE */
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -12287,6 +12287,9 @@
+@@ -12296,6 +12296,9 @@
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,

=== modified file 'patches/innodb_buffer_pool_shm.patch'
--- patches/innodb_buffer_pool_shm.patch	2011-12-08 07:27:43 +0000
+++ patches/innodb_buffer_pool_shm.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -1005,10 +1005,12 @@
+@@ -1022,10 +1022,12 @@
  	buf_block_t*	block;
  	byte*		frame;
  	ulint		i;
@@ -20,7 +20,7 @@
  	/* Reserve space for the block descriptors. */
  	mem_size += ut_2pow_round((mem_size / UNIV_PAGE_SIZE) * (sizeof *block)
  				  + (UNIV_PAGE_SIZE - 1), UNIV_PAGE_SIZE);
-@@ -1046,6 +1048,10 @@
+@@ -1063,6 +1065,10 @@
  		chunk->size = size;
  	}
  
@@ -55,7 +55,7 @@
  	srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
  
  	srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -11855,6 +11863,16 @@
+@@ -11864,6 +11872,16 @@
    "Number of buffer pool instances, set to higher value on high-end machines to increase scalability",
    NULL, NULL, 1L, 1L, MAX_BUFFER_POOLS, 1L);
  
@@ -72,7 +72,7 @@
  static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments.",
-@@ -12161,6 +12179,8 @@
+@@ -12170,6 +12188,8 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),

=== modified file 'patches/innodb_dict_size_limit.patch'
--- patches/innodb_dict_size_limit.patch	2011-12-08 08:05:30 +0000
+++ patches/innodb_dict_size_limit.patch	2011-12-29 02:23:24 +0000
@@ -377,7 +377,7 @@
    {"have_atomic_builtins",
    (char*) &export_vars.innodb_have_atomic_builtins,	  SHOW_BOOL},
    {"log_waits",
-@@ -11765,6 +11767,11 @@
+@@ -11774,6 +11776,11 @@
    "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
    NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
  
@@ -389,7 +389,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11834,6 +11841,7 @@
+@@ -11843,6 +11850,7 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_flushing_method),
@@ -399,7 +399,7 @@
    MYSQL_SYSVAR(change_buffering),
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -566,6 +566,7 @@
+@@ -575,6 +575,7 @@
  
  	/* Use old-style record format for the insert buffer. */
  	table = dict_mem_table_create(IBUF_TABLE_NAME, IBUF_SPACE_ID, 1, 0);

=== modified file 'patches/innodb_expand_fast_index_creation.patch'
--- patches/innodb_expand_fast_index_creation.patch	2011-12-13 13:49:04 +0000
+++ patches/innodb_expand_fast_index_creation.patch	2011-12-29 02:23:24 +0000
@@ -953,7 +953,7 @@
      key_info++;
    }
    if (!unique_key && !primary_key &&
-@@ -5256,6 +5280,10 @@
+@@ -5261,6 +5285,10 @@
    List<Create_field> new_create_list;
    /* New key definitions are added here */
    List<Key> new_key_list;
@@ -964,7 +964,7 @@
    List_iterator<Alter_drop> drop_it(alter_info->drop_list);
    List_iterator<Create_field> def_it(alter_info->create_list);
    List_iterator<Alter_column> alter_it(alter_info->alter_list);
-@@ -5268,6 +5296,7 @@
+@@ -5273,6 +5301,7 @@
    uint used_fields= create_info->used_fields;
    KEY *key_info=table->key_info;
    bool rc= TRUE;
@@ -972,7 +972,7 @@
  
    DBUG_ENTER("mysql_prepare_alter_table");
  
-@@ -5457,7 +5486,26 @@
+@@ -5462,7 +5491,26 @@
    /*
      Collect all keys which isn't in drop list. Add only those
      for which some fields exists.
@@ -1000,7 +1000,7 @@
  
    for (uint i=0 ; i < table->s->keys ; i++,key_info++)
    {
-@@ -5574,6 +5622,8 @@
+@@ -5579,6 +5627,8 @@
                     test(key_info->flags & HA_GENERATED_KEY),
                     key_parts);
        new_key_list.push_back(key);
@@ -1009,7 +1009,7 @@
      }
    }
    {
-@@ -5581,7 +5631,21 @@
+@@ -5586,7 +5636,21 @@
      while ((key=key_it++))			// Add new keys
      {
        if (key->type != Key::FOREIGN_KEY)
@@ -1031,7 +1031,7 @@
        if (key->name.str &&
  	  !my_strcasecmp(system_charset_info, key->name.str, primary_key_name))
        {
-@@ -5630,12 +5694,104 @@
+@@ -5635,12 +5699,104 @@
    rc= FALSE;
    alter_info->create_list.swap(new_create_list);
    alter_info->key_list.swap(new_key_list);
@@ -1136,7 +1136,7 @@
    Alter table
  
    SYNOPSIS
-@@ -6428,19 +6584,38 @@
+@@ -6434,19 +6590,38 @@
    */
    if (new_table && !(new_table->file->ha_table_flags() & HA_NO_COPY_ON_ALTER))
    {
@@ -1312,7 +1312,7 @@
  
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -556,6 +556,7 @@
+@@ -551,6 +551,7 @@
  
    double long_query_time_double;
  
@@ -1404,7 +1404,7 @@
   --expire-logs-days=# 
   If non-zero, binary logs will be purged after
   expire_logs_days days; possible purges happen at startup
-@@ -821,6 +825,7 @@
+@@ -823,6 +827,7 @@
  div-precision-increment 4
  engine-condition-pushdown TRUE
  event-scheduler OFF
@@ -1425,7 +1425,7 @@
   --expire-logs-days=# 
   If non-zero, binary logs will be purged after
   expire_logs_days days; possible purges happen at startup
-@@ -775,6 +779,7 @@
+@@ -777,6 +781,7 @@
  div-precision-increment 4
  engine-condition-pushdown TRUE
  event-scheduler OFF

=== modified file 'patches/innodb_expand_import.patch'
--- patches/innodb_expand_import.patch	2011-12-16 09:37:26 +0000
+++ patches/innodb_expand_import.patch	2011-12-29 02:23:24 +0000
@@ -884,7 +884,7 @@
  #endif /* !UNIV_HOTBACKUP */
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -7423,6 +7423,14 @@
+@@ -7422,6 +7422,14 @@
  		err = row_discard_tablespace_for_mysql(dict_table->name, trx);
  	} else {
  		err = row_import_tablespace_for_mysql(dict_table->name, trx);
@@ -899,7 +899,7 @@
  	}
  
  	err = convert_error_code_to_mysql(err, dict_table->flags, NULL);
-@@ -11772,6 +11780,11 @@
+@@ -11781,6 +11789,11 @@
    "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
    NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
  
@@ -911,7 +911,7 @@
  static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
    PLUGIN_VAR_RQCMDARG,
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
-@@ -11846,6 +11859,7 @@
+@@ -11855,6 +11868,7 @@
    MYSQL_SYSVAR(flush_neighbor_pages),
    MYSQL_SYSVAR(read_ahead),
    MYSQL_SYSVAR(adaptive_flushing_method),

=== modified file 'patches/innodb_extend_slow.patch'
--- patches/innodb_extend_slow.patch	2011-12-06 03:39:36 +0000
+++ patches/innodb_extend_slow.patch	2011-12-29 02:23:24 +0000
@@ -48,7 +48,7 @@
  
  /*
  		IMPLEMENTATION OF THE BUFFER POOL
-@@ -1834,8 +1868,16 @@
+@@ -1869,8 +1903,16 @@
  	mutex_t*	block_mutex;
  	ibool		must_read;
  	unsigned	access_time;
@@ -65,7 +65,7 @@
  	buf_pool->stat.n_page_gets++;
  
  	for (;;) {
-@@ -1853,7 +1895,7 @@
+@@ -1888,7 +1930,7 @@
  		//buf_pool_mutex_exit(buf_pool);
  		rw_lock_s_unlock(&buf_pool->page_hash_latch);
  
@@ -74,7 +74,7 @@
  
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  		ut_a(++buf_dbg_counter % 37 || buf_validate());
-@@ -1949,6 +1991,13 @@
+@@ -1984,6 +2026,13 @@
  		/* Let us wait until the read operation
  		completes */
  
@@ -88,7 +88,7 @@
  		for (;;) {
  			enum buf_io_fix	io_fix;
  
-@@ -1963,6 +2012,12 @@
+@@ -1998,6 +2047,12 @@
  				break;
  			}
  		}
@@ -101,7 +101,7 @@
  	}
  
  #ifdef UNIV_IBUF_COUNT_DEBUG
-@@ -2277,6 +2332,11 @@
+@@ -2312,6 +2367,11 @@
  	ibool		must_read;
  	ulint		retries = 0;
  	mutex_t*	block_mutex = NULL;
@@ -113,7 +113,7 @@
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
  	ut_ad(mtr);
-@@ -2306,6 +2366,9 @@
+@@ -2341,6 +2401,9 @@
  	      || ibuf_page_low(space, zip_size, offset,
  			       FALSE, file, line, NULL));
  #endif
@@ -123,7 +123,7 @@
  	buf_pool->stat.n_page_gets++;
  	fold = buf_page_address_fold(space, offset);
  loop:
-@@ -2376,9 +2439,9 @@
+@@ -2411,9 +2474,9 @@
  			return(NULL);
  		}
  
@@ -135,7 +135,7 @@
  
  			retries = 0;
  		} else if (retries < BUF_PAGE_READ_MAX_RETRIES) {
-@@ -2688,6 +2751,13 @@
+@@ -2723,6 +2786,13 @@
  			/* Let us wait until the read operation
  			completes */
  
@@ -149,7 +149,7 @@
  			for (;;) {
  				enum buf_io_fix	io_fix;
  
-@@ -2702,6 +2772,12 @@
+@@ -2737,6 +2807,12 @@
  					break;
  				}
  			}
@@ -162,7 +162,7 @@
  		}
  
  		fix_type = MTR_MEMO_BUF_FIX;
-@@ -2728,13 +2804,17 @@
+@@ -2763,13 +2839,17 @@
  		read-ahead */
  
  		buf_read_ahead_linear(space, zip_size, offset,
@@ -181,7 +181,7 @@
  	return(block);
  }
  
-@@ -2758,6 +2838,7 @@
+@@ -2793,6 +2873,7 @@
  	unsigned	access_time;
  	ibool		success;
  	ulint		fix_type;
@@ -189,7 +189,7 @@
  
  	ut_ad(block);
  	ut_ad(mtr);
-@@ -2835,6 +2916,10 @@
+@@ -2870,6 +2951,10 @@
  #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
  	ut_a(block->page.file_page_was_freed == FALSE);
  #endif
@@ -200,7 +200,7 @@
  	if (UNIV_UNLIKELY(!access_time)) {
  		/* In the case of a first access, try to apply linear
  		read-ahead */
-@@ -2842,7 +2927,7 @@
+@@ -2877,7 +2962,7 @@
  		buf_read_ahead_linear(buf_block_get_space(block),
  				      buf_block_get_zip_size(block),
  				      buf_block_get_page_no(block),
@@ -209,7 +209,7 @@
  	}
  
  #ifdef UNIV_IBUF_COUNT_DEBUG
-@@ -2852,6 +2937,9 @@
+@@ -2887,6 +2972,9 @@
  	buf_pool = buf_pool_from_block(block);
  	buf_pool->stat.n_page_gets++;
  
@@ -219,7 +219,7 @@
  	return(TRUE);
  }
  
-@@ -2874,6 +2962,7 @@
+@@ -2909,6 +2997,7 @@
  	buf_pool_t*	buf_pool;
  	ibool		success;
  	ulint		fix_type;
@@ -227,7 +227,7 @@
  
  	ut_ad(mtr);
  	ut_ad(mtr->state == MTR_ACTIVE);
-@@ -2960,6 +3049,11 @@
+@@ -2995,6 +3084,11 @@
  #endif
  	buf_pool->stat.n_page_gets++;
  
@@ -355,7 +355,7 @@
  
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
-@@ -4748,7 +4748,7 @@
+@@ -4757,7 +4757,7 @@
  				 node->name, node->handle, buf,
  				 offset_low, offset_high,
  				 page_size * n_pages,
@@ -364,7 +364,7 @@
  #endif
  		if (success) {
  			node->size += n_pages;
-@@ -5075,7 +5075,7 @@
+@@ -5084,7 +5084,7 @@
  i/o on a tablespace which does not exist */
  UNIV_INTERN
  ulint
@@ -373,7 +373,7 @@
  /*===*/
  	ulint	type,		/*!< in: OS_FILE_READ or OS_FILE_WRITE,
  				ORed to OS_FILE_LOG, if a log i/o
-@@ -5100,8 +5100,9 @@
+@@ -5109,8 +5109,9 @@
  	void*	buf,		/*!< in/out: buffer where to store read data
  				or from where to write; in aio this must be
  				appropriately aligned */
@@ -384,7 +384,7 @@
  {
  	ulint		mode;
  	fil_space_t*	space;
-@@ -5269,7 +5270,7 @@
+@@ -5278,7 +5279,7 @@
  #else
  	/* Queue the aio request */
  	ret = os_aio(type, mode | wake_later, node->name, node->handle, buf,
@@ -445,7 +445,7 @@
  /*********************************************************************//**
  Note that a transaction has been registered with MySQL.
  @return true if transaction is registered with MySQL 2PC coordinator */
-@@ -9409,6 +9445,25 @@
+@@ -9418,6 +9454,25 @@
  	statement has ended */
  
  	if (trx->n_mysql_tables_in_use == 0) {
@@ -514,7 +514,7 @@
  order to contract the insert buffer tree. Technically, this function is like
 --- a/storage/innobase/include/fil0fil.h
 +++ b/storage/innobase/include/fil0fil.h
-@@ -611,9 +611,12 @@
+@@ -615,9 +615,12 @@
  Reads or writes data. This operation is asynchronous (aio).
  @return DB_SUCCESS, or DB_TABLESPACE_DELETED if we are trying to do
  i/o on a tablespace which does not exist */
@@ -528,7 +528,7 @@
  /*===*/
  	ulint	type,		/*!< in: OS_FILE_READ or OS_FILE_WRITE,
  				ORed to OS_FILE_LOG, if a log i/o
-@@ -638,8 +641,9 @@
+@@ -642,8 +645,9 @@
  	void*	buf,		/*!< in/out: buffer where to store read data
  				or from where to write; in aio this must be
  				appropriately aligned */

=== modified file 'patches/innodb_extra_rseg.patch'
--- patches/innodb_extra_rseg.patch	2011-12-13 15:06:50 +0000
+++ patches/innodb_extra_rseg.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11655,6 +11655,7 @@
+@@ -11664,6 +11664,7 @@
    NULL, /* reserved */
    0,    /* flags */
  },

=== modified file 'patches/innodb_fake_changes.patch'
--- patches/innodb_fake_changes.patch	2011-12-08 07:27:43 +0000
+++ patches/innodb_fake_changes.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0cur.c
 +++ b/storage/innobase/btr/btr0cur.c
-@@ -1173,6 +1173,11 @@
+@@ -1158,6 +1158,11 @@
  	rec_t*		rec;
  	roll_ptr_t	roll_ptr;
  
@@ -19,7 +19,7 @@
  	/* Check if we have to wait for a lock: enqueue an explicit lock
  	request if yes */
  
-@@ -1304,7 +1309,7 @@
+@@ -1289,7 +1294,7 @@
  	}
  #endif /* UNIV_DEBUG */
  
@@ -28,7 +28,7 @@
  	max_size = page_get_max_insert_size_after_reorganize(page, 1);
  	leaf = page_is_leaf(page);
  
-@@ -1399,6 +1404,12 @@
+@@ -1384,6 +1389,12 @@
  		goto fail_err;
  	}
  
@@ -41,7 +41,7 @@
  	page_cursor = btr_cur_get_page_cur(cursor);
  
  	/* Now, try the insert */
-@@ -1541,10 +1552,10 @@
+@@ -1526,10 +1537,10 @@
  
  	*big_rec = NULL;
  
@@ -54,7 +54,7 @@
  				MTR_MEMO_PAGE_X_FIX));
  
  	/* Try first an optimistic insert; reset the cursor flag: we do not
-@@ -1610,6 +1621,16 @@
+@@ -1595,6 +1606,16 @@
  		}
  	}
  
@@ -71,7 +71,7 @@
  	if (dict_index_get_page(index)
  	    == buf_block_get_page_no(btr_cur_get_block(cursor))) {
  
-@@ -1666,6 +1687,11 @@
+@@ -1651,6 +1672,11 @@
  
  	ut_ad(cursor && update && thr && roll_ptr);
  
@@ -83,7 +83,7 @@
  	rec = btr_cur_get_rec(cursor);
  	index = cursor->index;
  
-@@ -1965,6 +1991,14 @@
+@@ -1950,6 +1976,14 @@
  		return(err);
  	}
  
@@ -98,7 +98,7 @@
  	if (!(flags & BTR_KEEP_SYS_FLAG)) {
  		row_upd_rec_sys_fields(rec, NULL,
  				       index, offsets, trx, roll_ptr);
-@@ -2074,7 +2108,7 @@
+@@ -2059,7 +2093,7 @@
  	rec = btr_cur_get_rec(cursor);
  	index = cursor->index;
  	ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table));
@@ -107,7 +107,7 @@
  	/* The insert buffer tree should never be updated in place. */
  	ut_ad(!dict_index_is_ibuf(index));
  
-@@ -2187,6 +2221,11 @@
+@@ -2172,6 +2206,11 @@
  		goto err_exit;
  	}
  
@@ -119,7 +119,7 @@
  	/* Ok, we may do the replacement. Store on the page infimum the
  	explicit locks on rec, before deleting rec (see the comment in
  	btr_cur_pessimistic_update). */
-@@ -2337,9 +2376,9 @@
+@@ -2322,9 +2361,9 @@
  	rec = btr_cur_get_rec(cursor);
  	index = cursor->index;
  
@@ -131,7 +131,7 @@
  #ifdef UNIV_ZIP_DEBUG
  	ut_a(!page_zip || page_zip_validate(page_zip, page));
  #endif /* UNIV_ZIP_DEBUG */
-@@ -2427,6 +2466,9 @@
+@@ -2412,6 +2451,9 @@
  
  		ut_ad(big_rec_vec == NULL);
  
@@ -141,7 +141,7 @@
  		btr_rec_free_updated_extern_fields(
  			index, rec, page_zip, offsets, update,
  			trx_is_recv(trx) ? RB_RECOVERY : RB_NORMAL, mtr);
-@@ -2461,6 +2503,12 @@
+@@ -2446,6 +2488,12 @@
  		}
  	}
  
@@ -154,7 +154,7 @@
  	/* Store state of explicit locks on rec on the page infimum record,
  	before deleting rec. The page infimum acts as a dummy carrier of the
  	locks, taking care also of lock releases, before we can move the locks
-@@ -2763,6 +2811,11 @@
+@@ -2748,6 +2796,11 @@
  	ut_ad(dict_index_is_clust(index));
  	ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets)));
  
@@ -166,7 +166,7 @@
  	err = lock_clust_rec_modify_check_and_lock(flags, block,
  						   rec, index, offsets, thr);
  
-@@ -2897,6 +2950,11 @@
+@@ -2882,6 +2935,11 @@
  	rec_t*		rec;
  	ulint		err;
  
@@ -214,7 +214,7 @@
  	/* Transaction is deregistered only in a commit or a rollback. If
  	it is deregistered we know there cannot be resources to be freed
  	and we could return immediately.  For the time being, we play safe
-@@ -7545,6 +7558,12 @@
+@@ -7544,6 +7557,12 @@
  
  	trx = innobase_trx_allocate(thd);
  
@@ -227,7 +227,7 @@
  	/* Latch the InnoDB data dictionary exclusively so that no deadlocks
  	or lock waits can happen in it during a table create operation.
  	Drop table etc. do this latching in row0mysql.c. */
-@@ -7765,6 +7784,10 @@
+@@ -7764,6 +7783,10 @@
  		DBUG_RETURN(HA_ERR_CRASHED);
  	}
  
@@ -238,7 +238,7 @@
  	/* Truncate the table in InnoDB */
  
  	error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
-@@ -7821,6 +7844,12 @@
+@@ -7820,6 +7843,12 @@
  
  	trx = innobase_trx_allocate(thd);
  
@@ -251,7 +251,7 @@
  	name_len = strlen(name);
  
  	ut_a(name_len < 1000);
-@@ -7907,6 +7936,12 @@
+@@ -7906,6 +7935,12 @@
  	trx->mysql_thd = NULL;
  #else
  	trx = innobase_trx_allocate(thd);
@@ -264,7 +264,7 @@
  #endif
  	row_drop_database_for_mysql(namebuf, trx);
  	my_free(namebuf);
-@@ -8012,6 +8047,11 @@
+@@ -8011,6 +8046,11 @@
  	trx_search_latch_release_if_reserved(parent_trx);
  
  	trx = innobase_trx_allocate(thd);
@@ -276,7 +276,7 @@
  
  	error = innobase_rename_table(trx, from, to, TRUE);
  
-@@ -10872,6 +10912,10 @@
+@@ -10881,6 +10921,10 @@
  		return(0);
  	}
  
@@ -287,7 +287,7 @@
  	thd_get_xid(thd, (MYSQL_XID*) &trx->xid);
  
  	/* Release a possible FIFO ticket and search latch. Since we will
-@@ -12429,6 +12473,7 @@
+@@ -12438,6 +12482,7 @@
    MYSQL_SYSVAR(rollback_segments),
    MYSQL_SYSVAR(corrupt_table_action),
    MYSQL_SYSVAR(lazy_drop_table),
@@ -348,7 +348,7 @@
  	/* Flag this transaction as a dictionary operation, so that
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -3496,6 +3496,8 @@
+@@ -3424,6 +3424,8 @@
  
  	ut_a(trx_sys_multiple_tablespace_format);
  

=== modified file 'patches/innodb_fast_checksum.patch'
--- patches/innodb_fast_checksum.patch	2011-12-08 08:23:02 +0000
+++ patches/innodb_fast_checksum.patch	2011-12-29 02:23:24 +0000
@@ -161,7 +161,7 @@
  
  	srv_blocking_lru_restore = (ibool) innobase_blocking_lru_restore;
  
-@@ -11533,6 +11535,15 @@
+@@ -11542,6 +11544,15 @@
    "Disable with --skip-innodb-checksums.",
    NULL, NULL, TRUE);
  
@@ -177,7 +177,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -12064,6 +12075,7 @@
+@@ -12073,6 +12084,7 @@
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(buffer_pool_instances),
    MYSQL_SYSVAR(checksums),
@@ -201,7 +201,7 @@
  looked at the first few bytes of the page. This calculates that old
 --- a/storage/innobase/include/fil0fil.h
 +++ b/storage/innobase/include/fil0fil.h
-@@ -118,6 +118,7 @@
+@@ -119,6 +119,7 @@
  #define FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID  34 /*!< starting from 4.1.x this
  					contains the space id of the page */
  #define FIL_PAGE_DATA		38	/*!< start of the data on the page */

=== modified file 'patches/innodb_files_extend.patch'
--- patches/innodb_files_extend.patch	2011-12-06 03:39:36 +0000
+++ patches/innodb_files_extend.patch	2011-12-29 02:23:24 +0000
@@ -16,7 +16,7 @@
  			fprintf(stderr,
  				"InnoDB: Error: the size of single-table"
  				" tablespace file %s\n"
-@@ -4152,7 +4152,7 @@
+@@ -4161,7 +4161,7 @@
  
  	size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
  #ifndef UNIV_HOTBACKUP
@@ -25,7 +25,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: the size of single-table tablespace"
  			" file %s\n"
-@@ -4172,7 +4172,7 @@
+@@ -4181,7 +4181,7 @@
  	/* Align the memory for file i/o if we might have O_DIRECT set */
  	page = ut_align(buf2, UNIV_PAGE_SIZE);
  
@@ -34,7 +34,7 @@
  		success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE);
  
  		/* We have to read the tablespace id from the file */
-@@ -5150,9 +5150,9 @@
+@@ -5159,9 +5159,9 @@
  	ut_ad(ut_is_2pow(zip_size));
  	ut_ad(buf);
  	ut_ad(len > 0);
@@ -175,7 +175,7 @@
  #ifndef MYSQL_SERVER
  	innodb_overwrite_relay_log_info = FALSE;
  #endif
-@@ -7291,9 +7353,9 @@
+@@ -7290,9 +7352,9 @@
  				| DICT_TF_COMPACT
  				| DICT_TF_FORMAT_ZIP
  				<< DICT_TF_FORMAT_SHIFT;
@@ -188,7 +188,7 @@
  		}
  	}
  
-@@ -11544,6 +11606,16 @@
+@@ -11553,6 +11615,16 @@
    "#### Attention: The checksum is not compatible for normal or disabled version! ####",
    NULL, NULL, FALSE);
  
@@ -205,7 +205,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -12070,6 +12142,8 @@
+@@ -12079,6 +12151,8 @@
    NULL, NULL, 0, &corrupt_table_action_typelib);
  
  static struct st_mysql_sys_var* innobase_system_variables[]= {

=== modified file 'patches/innodb_fix_misc.patch'
--- patches/innodb_fix_misc.patch	2011-12-08 08:29:49 +0000
+++ patches/innodb_fix_misc.patch	2011-12-29 02:23:24 +0000
@@ -12,7 +12,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -1944,6 +1944,27 @@
+@@ -1979,6 +1979,27 @@
  #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
  	}
  
@@ -40,7 +40,7 @@
  	if (UNIV_UNLIKELY(!bpage->zip.data)) {
  		/* There is no compressed page. */
  err_exit:
-@@ -2452,6 +2473,27 @@
+@@ -2487,6 +2508,27 @@
  		block = (buf_block_t*) buf_page_hash_get_low(
  			buf_pool, space, offset, fold);
  		if (block) {
@@ -68,7 +68,7 @@
  			block_mutex = buf_page_get_mutex_enter((buf_page_t*)block);
  			ut_a(block_mutex);
  		}
-@@ -3374,11 +3416,28 @@
+@@ -3409,11 +3451,28 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -97,7 +97,7 @@
  	if (watch_page && !buf_pool_watch_is_sentinel(buf_pool, watch_page)) {
  		/* The page is already in the buffer pool. */
  		watch_page = NULL;
-@@ -3509,6 +3568,7 @@
+@@ -3544,6 +3603,7 @@
  		bpage->state	= BUF_BLOCK_ZIP_PAGE;
  		bpage->space	= space;
  		bpage->offset	= offset;
@@ -105,7 +105,7 @@
  
  #ifdef UNIV_DEBUG
  		bpage->in_page_hash = FALSE;
-@@ -3593,6 +3653,7 @@
+@@ -3628,6 +3688,7 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -113,7 +113,7 @@
  	//buf_pool_mutex_enter(buf_pool);
  	mutex_enter(&buf_pool->LRU_list_mutex);
  	rw_lock_x_lock(&buf_pool->page_hash_latch);
-@@ -3600,6 +3661,21 @@
+@@ -3635,6 +3696,21 @@
  	block = (buf_block_t*) buf_page_hash_get_low(
  		buf_pool, space, offset, fold);
  
@@ -135,7 +135,7 @@
  	if (block
  	    && buf_page_in_file(&block->page)
  	    && !buf_pool_watch_is_sentinel(buf_pool, &block->page)) {
-@@ -3953,8 +4029,11 @@
+@@ -3988,8 +4064,11 @@
  	}
  
  	if (io_type == BUF_IO_WRITE
@@ -308,7 +308,7 @@
  #endif
  	/* printf("Deleting tablespace %s id %lu\n", space->name, id); */
  
-@@ -4722,6 +4729,10 @@
+@@ -4731,6 +4738,10 @@
  	ulint		page_size;
  	ibool		success		= TRUE;
  
@@ -319,7 +319,7 @@
  	fil_mutex_enter_and_prepare_for_io(space_id);
  
  	space = fil_space_get_by_id(space_id);
-@@ -4733,6 +4744,7 @@
+@@ -4742,6 +4753,7 @@
  		*actual_size = space->size;
  
  		mutex_exit(&fil_system->mutex);
@@ -327,7 +327,7 @@
  
  		return(TRUE);
  	}
-@@ -4765,6 +4777,8 @@
+@@ -4774,6 +4786,8 @@
  		offset_low  = ((start_page_no - file_start_page_no)
  			       % (4096 * ((1024 * 1024) / page_size)))
  			* page_size;
@@ -336,7 +336,7 @@
  #ifdef UNIV_HOTBACKUP
  		success = os_file_write(node->name, node->handle, buf,
  					offset_low, offset_high,
-@@ -4774,8 +4788,10 @@
+@@ -4783,8 +4797,10 @@
  				 node->name, node->handle, buf,
  				 offset_low, offset_high,
  				 page_size * n_pages,
@@ -348,7 +348,7 @@
  		if (success) {
  			node->size += n_pages;
  			space->size += n_pages;
-@@ -4821,6 +4837,7 @@
+@@ -4830,6 +4846,7 @@
  	printf("Extended %s to %lu, actual size %lu pages\n", space->name,
  	size_after_extend, *actual_size); */
  	mutex_exit(&fil_system->mutex);
@@ -356,7 +356,7 @@
  
  	fil_flush(space_id, TRUE);
  
-@@ -5183,6 +5200,22 @@
+@@ -5192,6 +5209,22 @@
  		srv_data_written+= len;
  	}
  
@@ -379,7 +379,7 @@
  	/* Reserve the fil_system mutex and make sure that we can open at
  	least one file while holding it, if the file is not already open */
  
-@@ -5324,10 +5357,24 @@
+@@ -5333,10 +5366,24 @@
  #else
  	/* Queue the aio request */
  	ret = os_aio(type, mode | wake_later, node->name, node->handle, buf,
@@ -405,7 +405,7 @@
  	ut_a(ret);
  
  	if (mode == OS_AIO_SYNC) {
-@@ -5427,6 +5474,7 @@
+@@ -5436,6 +5483,7 @@
  	fil_node_t*	fil_node;
  	void*		message;
  	ulint		type;
@@ -413,7 +413,7 @@
  
  	ut_ad(fil_validate_skip());
  
-@@ -5434,10 +5482,10 @@
+@@ -5443,10 +5491,10 @@
  		srv_set_io_thread_op_info(segment, "native aio handle");
  #ifdef WIN_ASYNC_IO
  		ret = os_aio_windows_handle(segment, 0, &fil_node,
@@ -426,7 +426,7 @@
  #else
  		ut_error;
  		ret = 0; /* Eliminate compiler warning */
-@@ -5446,7 +5494,22 @@
+@@ -5455,7 +5503,22 @@
  		srv_set_io_thread_op_info(segment, "simulated aio handle");
  
  		ret = os_aio_simulated_handle(segment, &fil_node,
@@ -452,7 +452,7 @@
  	ut_a(ret);
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -12141,6 +12141,12 @@
+@@ -12150,6 +12150,12 @@
    "except for the deletion.",
    NULL, NULL, 0, &corrupt_table_action_typelib);
  
@@ -465,7 +465,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(page_size),
    MYSQL_SYSVAR(log_block_size),
-@@ -12235,6 +12241,7 @@
+@@ -12244,6 +12250,7 @@
    MYSQL_SYSVAR(purge_batch_size),
    MYSQL_SYSVAR(rollback_segments),
    MYSQL_SYSVAR(corrupt_table_action),
@@ -473,7 +473,7 @@
    NULL
  };
  
-@@ -12244,7 +12251,7 @@
+@@ -12253,7 +12260,7 @@
    &innobase_storage_engine,
    innobase_hton_name,
    plugin_author,

=== modified file 'patches/innodb_io_patches.patch'
--- patches/innodb_io_patches.patch	2011-12-08 07:51:45 +0000
+++ patches/innodb_io_patches.patch	2011-12-29 02:23:24 +0000
@@ -175,7 +175,7 @@
  	srv_force_recovery = (ulint) innobase_force_recovery;
  
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
-@@ -11133,7 +11153,7 @@
+@@ -11142,7 +11162,7 @@
    PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
    "Purge threads can be either 0 or 1.",
    NULL, NULL,
@@ -184,7 +184,7 @@
    0,			/* Minimum value */
    1, 0);		/* Maximum value */
  
-@@ -11175,12 +11195,18 @@
+@@ -11184,12 +11204,18 @@
    innodb_file_format_max_validate,
    innodb_file_format_max_update, "Antelope");
  
@@ -209,7 +209,7 @@
  
  static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11285,7 +11311,7 @@
+@@ -11294,7 +11320,7 @@
  static MYSQL_SYSVAR_LONGLONG(buffer_pool_size, innobase_buffer_pool_size,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
@@ -218,7 +218,7 @@
  
  static MYSQL_SYSVAR_LONG(buffer_pool_instances, innobase_buffer_pool_instances,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11442,6 +11468,95 @@
+@@ -11451,6 +11477,95 @@
    "trigger a readahead.",
    NULL, NULL, 56, 0, 64, 0);
  
@@ -314,7 +314,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11462,6 +11577,7 @@
+@@ -11471,6 +11586,7 @@
    MYSQL_SYSVAR(file_format_check),
    MYSQL_SYSVAR(file_format_max),
    MYSQL_SYSVAR(flush_log_at_trx_commit),
@@ -322,7 +322,7 @@
    MYSQL_SYSVAR(flush_method),
    MYSQL_SYSVAR(force_recovery),
    MYSQL_SYSVAR(large_prefix),
-@@ -11501,6 +11617,13 @@
+@@ -11510,6 +11626,13 @@
    MYSQL_SYSVAR(show_verbose_locks),
    MYSQL_SYSVAR(show_locks_held),
    MYSQL_SYSVAR(version),
@@ -338,7 +338,7 @@
    MYSQL_SYSVAR(change_buffering),
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -514,8 +514,10 @@
+@@ -523,8 +523,10 @@
  	grow in size, as the references on the upper levels of the tree can
  	change */
  
@@ -351,7 +351,7 @@
  
  	mutex_create(ibuf_pessimistic_insert_mutex_key,
  		     &ibuf_pessimistic_insert_mutex,
-@@ -2753,9 +2755,11 @@
+@@ -2763,9 +2765,11 @@
  	size = ibuf->size;
  	max_size = ibuf->max_size;
  

=== modified file 'patches/innodb_kill_idle_transaction.patch'
--- patches/innodb_kill_idle_transaction.patch	2011-11-16 09:26:51 +0000
+++ patches/innodb_kill_idle_transaction.patch	2011-12-29 02:23:24 +0000
@@ -114,7 +114,7 @@
  #ifdef HAVE_PSI_INTERFACE
  	/* Register keys with MySQL performance schema */
  	if (PSI_server) {
-@@ -11686,6 +11690,57 @@
+@@ -11695,6 +11699,57 @@
  	return(false);
  }
  
@@ -172,7 +172,7 @@
  static SHOW_VAR innodb_status_variables_export[]= {
    {"Innodb",                   (char*) &show_innodb_vars, SHOW_FUNC},
    {NullS, NullS, SHOW_LONG}
-@@ -11977,6 +12032,15 @@
+@@ -11986,6 +12041,15 @@
    "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
    NULL, NULL, 500L, 1L, ~0L, 0);
  
@@ -188,7 +188,7 @@
  static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
    "Number of file I/O threads in InnoDB.",
-@@ -12279,6 +12343,7 @@
+@@ -12288,6 +12352,7 @@
    MYSQL_SYSVAR(fast_checksum),
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),

=== modified file 'patches/innodb_lru_dump_restore.patch'
--- patches/innodb_lru_dump_restore.patch	2011-11-14 10:30:04 +0000
+++ patches/innodb_lru_dump_restore.patch	2011-12-29 02:23:24 +0000
@@ -310,7 +310,7 @@
  /*==============*/
 --- a/storage/innobase/fil/fil0fil.c
 +++ b/storage/innobase/fil/fil0fil.c
-@@ -5290,6 +5290,70 @@
+@@ -5299,6 +5299,70 @@
  	return(DB_SUCCESS);
  }
  
@@ -401,7 +401,7 @@
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
  		os_large_page_size = (ulint) opt_large_page_size;
-@@ -11916,6 +11920,19 @@
+@@ -11925,6 +11929,19 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
  
@@ -421,7 +421,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -12000,6 +12017,8 @@
+@@ -12009,6 +12026,8 @@
    MYSQL_SYSVAR(random_read_ahead),
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
@@ -440,7 +440,7 @@
  }
  
  #define OK(expr)		\
-@@ -4298,6 +4299,36 @@
+@@ -4336,6 +4337,36 @@
  			"Hello!");
  		goto end_func;
  	}
@@ -540,7 +540,7 @@
  an exclusive lock on the buffer frame. The flag is cleared and the x-lock
 --- a/storage/innobase/include/fil0fil.h
 +++ b/storage/innobase/include/fil0fil.h
-@@ -644,6 +644,14 @@
+@@ -648,6 +648,14 @@
  	void*	message,	/*!< in: message for aio handler if non-sync
  				aio used, else ignored */
  	trx_t*	trx);

=== modified file 'patches/innodb_opt_lru_count.patch'
--- patches/innodb_opt_lru_count.patch	2011-12-05 08:46:53 +0000
+++ patches/innodb_opt_lru_count.patch	2011-12-29 02:23:24 +0000
@@ -18,7 +18,7 @@
  		ut_a(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE);
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -880,9 +880,9 @@
+@@ -890,9 +890,9 @@
  	block->page.in_zip_hash = FALSE;
  	block->page.in_flush_list = FALSE;
  	block->page.in_free_list = FALSE;
@@ -29,7 +29,7 @@
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
  	block->n_pointers = 0;
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
-@@ -1366,7 +1366,7 @@
+@@ -1401,7 +1401,7 @@
  
  	memcpy(dpage, bpage, sizeof *dpage);
  
@@ -38,7 +38,7 @@
  	ut_d(bpage->in_page_hash = FALSE);
  
  	/* relocate buf_pool->LRU */
-@@ -3188,8 +3188,8 @@
+@@ -3223,8 +3223,8 @@
  		bpage->in_zip_hash = FALSE;
  		bpage->in_flush_list = FALSE;
  		bpage->in_free_list = FALSE;
@@ -48,7 +48,7 @@
  
  		ut_d(bpage->in_page_hash = TRUE);
  
-@@ -3354,7 +3354,7 @@
+@@ -3389,7 +3389,7 @@
  	ibuf_merge_or_delete_for_page(NULL, space, offset, zip_size, TRUE);
  
  	/* Flush pages from the end of the LRU list if necessary */

=== modified file 'patches/innodb_overwrite_relay_log_info.patch'
--- patches/innodb_overwrite_relay_log_info.patch	2011-12-05 08:47:16 +0000
+++ patches/innodb_overwrite_relay_log_info.patch	2011-12-29 02:23:24 +0000
@@ -248,7 +248,7 @@
  
  		trx_commit_for_mysql(trx);
  	}
-@@ -11122,6 +11314,12 @@
+@@ -11131,6 +11323,12 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -261,7 +261,7 @@
  static MYSQL_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "Enable InnoDB doublewrite buffer (enabled by default). "
-@@ -11599,6 +11797,7 @@
+@@ -11608,6 +11806,7 @@
    MYSQL_SYSVAR(old_blocks_pct),
    MYSQL_SYSVAR(old_blocks_time),
    MYSQL_SYSVAR(open_files),

=== modified file 'patches/innodb_pass_corrupt_table.patch'
--- patches/innodb_pass_corrupt_table.patch	2011-12-06 03:39:36 +0000
+++ patches/innodb_pass_corrupt_table.patch	2011-12-29 02:23:24 +0000
@@ -146,7 +146,7 @@
  #ifdef UNIV_BTR_DEBUG
  		ut_a(page_is_comp(get_block->frame) == page_is_comp(page));
  #endif /* UNIV_BTR_DEBUG */
-@@ -592,6 +622,19 @@
+@@ -590,6 +620,19 @@
  		file, line, mtr);
  
  	if (block == NULL) {
@@ -166,7 +166,7 @@
  		/* This must be a search to perform an insert/delete
  		mark/ delete; try using the insert/delete buffer */
  
-@@ -666,6 +709,16 @@
+@@ -664,6 +707,16 @@
  	block->check_index_page_at_flush = TRUE;
  	page = buf_block_get_frame(block);
  
@@ -183,7 +183,7 @@
  	if (rw_latch != RW_NO_LATCH) {
  #ifdef UNIV_ZIP_DEBUG
  		const page_zip_des_t*	page_zip
-@@ -872,6 +925,17 @@
+@@ -857,6 +910,17 @@
  					 RW_NO_LATCH, NULL, BUF_GET,
  					 file, line, mtr);
  		page = buf_block_get_frame(block);
@@ -201,7 +201,7 @@
  		ut_ad(index->id == btr_page_get_index_id(page));
  
  		block->check_index_page_at_flush = TRUE;
-@@ -992,6 +1056,14 @@
+@@ -977,6 +1041,14 @@
  					 RW_NO_LATCH, NULL, BUF_GET,
  					 file, line, mtr);
  		page = buf_block_get_frame(block);
@@ -216,7 +216,7 @@
  		ut_ad(index->id == btr_page_get_index_id(page));
  
  		if (height == ULINT_UNDEFINED) {
-@@ -1205,6 +1277,12 @@
+@@ -1190,6 +1262,12 @@
  	*big_rec = NULL;
  
  	block = btr_cur_get_block(cursor);
@@ -229,7 +229,7 @@
  	page = buf_block_get_frame(block);
  	index = cursor->index;
  	zip_size = buf_block_get_zip_size(block);
-@@ -2937,6 +3015,11 @@
+@@ -2922,6 +3000,11 @@
  
  	block = btr_cur_get_block(cursor);
  
@@ -241,7 +241,7 @@
  	ut_ad(page_is_leaf(buf_block_get_frame(block)));
  
  	rec = btr_cur_get_rec(cursor);
-@@ -3645,6 +3728,11 @@
+@@ -3630,6 +3713,11 @@
  
  		page = btr_cur_get_page(&cursor);
  
@@ -277,7 +277,7 @@
  	index = btr_cur_get_index(btr_pcur_get_btr_cur(cursor));
  
  	page_cursor = btr_pcur_get_page_cur(cursor);
-@@ -395,6 +401,15 @@
+@@ -397,6 +403,15 @@
  				   cursor->latch_mode,
  				   btr_pcur_get_btr_cur(cursor)->index, mtr);
  	next_page = buf_block_get_frame(next_block);
@@ -326,7 +326,7 @@
  
  /* prototypes for new functions added to ha_innodb.cc */
  trx_t* innobase_get_trx();
-@@ -1134,6 +1135,11 @@
+@@ -1151,6 +1152,11 @@
  			ready = buf_flush_ready_for_replace(&block->page);
  			mutex_exit(&block->mutex);
  
@@ -338,7 +338,7 @@
  			if (!ready) {
  
  				return(block);
-@@ -1910,6 +1916,13 @@
+@@ -1945,6 +1951,13 @@
  		return(NULL);
  	}
  
@@ -352,7 +352,7 @@
  	block_mutex = buf_page_get_mutex_enter(bpage);
  
  	rw_lock_s_unlock(&buf_pool->page_hash_latch);
-@@ -2489,6 +2502,13 @@
+@@ -2524,6 +2537,13 @@
  		return(NULL);
  	}
  
@@ -366,7 +366,7 @@
  	switch (buf_block_get_state(block)) {
  		buf_page_t*	bpage;
  		ibool		success;
-@@ -3163,6 +3183,7 @@
+@@ -3198,6 +3218,7 @@
  	bpage->newest_modification = 0;
  	bpage->oldest_modification = 0;
  	HASH_INVALIDATE(bpage, hash);
@@ -374,7 +374,7 @@
  #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
  	bpage->file_page_was_freed = FALSE;
  #endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
-@@ -3801,6 +3822,7 @@
+@@ -3836,6 +3857,7 @@
  				(ulong) bpage->offset);
  		}
  
@@ -382,7 +382,7 @@
  		/* From version 3.23.38 up we store the page checksum
  		to the 4 first bytes of the page end lsn field */
  
-@@ -3842,6 +3864,23 @@
+@@ -3877,6 +3899,23 @@
  			      REFMAN "forcing-innodb-recovery.html\n"
  			      "InnoDB: about forcing recovery.\n", stderr);
  
@@ -406,7 +406,7 @@
  			if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) {
  				/* If page space id is larger than TRX_SYS_SPACE
  				(0), we will attempt to mark the corresponding
-@@ -3858,6 +3897,7 @@
+@@ -3893,6 +3932,7 @@
  				}
  			}
  		}
@@ -414,7 +414,7 @@
  
  		if (recv_recovery_is_on()) {
  			/* Pages must be uncompressed for crash recovery. */
-@@ -3867,8 +3907,11 @@
+@@ -3902,8 +3942,11 @@
  
  		if (uncompressed && !recv_no_ibuf_operations) {
  			ibuf_merge_or_delete_for_page(
@@ -584,7 +584,7 @@
  	UT_LIST_ADD_LAST(space_list, fil_system->space_list, space);
  
  	mutex_exit(&fil_system->mutex);
-@@ -5268,6 +5271,34 @@
+@@ -5277,6 +5280,34 @@
  	ut_a(byte_offset % OS_FILE_LOG_BLOCK_SIZE == 0);
  	ut_a((len % OS_FILE_LOG_BLOCK_SIZE) == 0);
  
@@ -619,7 +619,7 @@
  #ifdef UNIV_HOTBACKUP
  	/* In ibbackup do normal i/o, not aio */
  	if (type == OS_FILE_READ) {
-@@ -5282,6 +5313,8 @@
+@@ -5291,6 +5322,8 @@
  	ret = os_aio(type, mode | wake_later, node->name, node->handle, buf,
  		     offset_low, offset_high, len, node, message, trx);
  #endif
@@ -628,7 +628,7 @@
  	ut_a(ret);
  
  	if (mode == OS_AIO_SYNC) {
-@@ -5782,3 +5815,46 @@
+@@ -5791,3 +5824,46 @@
                 return 0;
         }
  }
@@ -831,7 +831,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
  		table->timestamp_field->set_time();
  
-@@ -5404,6 +5427,10 @@
+@@ -5403,6 +5426,10 @@
  func_exit:
  	innobase_active_small();
  
@@ -842,7 +842,7 @@
  	DBUG_RETURN(error_result);
  }
  
-@@ -5581,6 +5608,10 @@
+@@ -5580,6 +5607,10 @@
  
  	ha_statistic_increment(&SSV::ha_update_count);
  
@@ -853,7 +853,7 @@
  	if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
  		table->timestamp_field->set_time();
  
-@@ -5670,6 +5701,10 @@
+@@ -5668,6 +5699,10 @@
  
  	innobase_active_small();
  
@@ -864,7 +864,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5691,6 +5726,10 @@
+@@ -5689,6 +5724,10 @@
  
  	ha_statistic_increment(&SSV::ha_delete_count);
  
@@ -875,7 +875,7 @@
  	if (!prebuilt->upd_node) {
  		row_get_prebuilt_update_vector(prebuilt);
  	}
-@@ -5717,6 +5756,10 @@
+@@ -5715,6 +5754,10 @@
  
  	innobase_active_small();
  
@@ -886,7 +886,7 @@
  	DBUG_RETURN(error);
  }
  
-@@ -5956,6 +5999,10 @@
+@@ -5954,6 +5997,10 @@
  
  	ha_statistic_increment(&SSV::ha_read_key_count);
  
@@ -897,7 +897,7 @@
  	index = prebuilt->index;
  
  	if (UNIV_UNLIKELY(index == NULL) || dict_index_is_corrupted(index)) {
-@@ -6023,6 +6070,10 @@
+@@ -6022,6 +6069,10 @@
  		ret = DB_UNSUPPORTED;
  	}
  
@@ -908,7 +908,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -6138,6 +6189,10 @@
+@@ -6137,6 +6188,10 @@
  {
  	DBUG_ENTER("change_active_index");
  
@@ -919,7 +919,7 @@
  	ut_ad(user_thd == ha_thd());
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
-@@ -6251,6 +6306,10 @@
+@@ -6250,6 +6305,10 @@
  
  	DBUG_ENTER("general_fetch");
  
@@ -930,7 +930,7 @@
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
  	innodb_srv_conc_enter_innodb(prebuilt->trx);
-@@ -6260,6 +6319,10 @@
+@@ -6259,6 +6318,10 @@
  
  	innodb_srv_conc_exit_innodb(prebuilt->trx);
  
@@ -941,7 +941,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -7526,10 +7589,18 @@
+@@ -7525,10 +7588,18 @@
  
  	update_thd(ha_thd());
  
@@ -960,7 +960,7 @@
  	error = convert_error_code_to_mysql(error, prebuilt->table->flags,
  					    NULL);
  
-@@ -8034,6 +8105,16 @@
+@@ -8040,6 +8111,16 @@
  	return(ranges + (double) rows / (double) total_rows * time_for_scan);
  }
  
@@ -977,7 +977,7 @@
  /*********************************************************************//**
  Calculates the key number used inside MySQL for an Innobase index. We will
  first check the "index translation table" for a match of the index to get
-@@ -8211,7 +8292,7 @@
+@@ -8217,7 +8298,7 @@
  	ib_table = prebuilt->table;
  
  	if (flag & HA_STATUS_TIME) {
@@ -986,7 +986,7 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
-@@ -8511,10 +8592,18 @@
+@@ -8517,10 +8598,18 @@
  	THD*		thd,		/*!< in: connection thread handle */
  	HA_CHECK_OPT*	check_opt)	/*!< in: currently ignored */
  {
@@ -1005,7 +1005,7 @@
  	return(0);
  }
  
-@@ -8747,6 +8836,10 @@
+@@ -8756,6 +8845,10 @@
  		my_error(ER_QUERY_INTERRUPTED, MYF(0));
  	}
  
@@ -1016,7 +1016,7 @@
  	DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
  }
  
-@@ -9517,6 +9610,10 @@
+@@ -9526,6 +9619,10 @@
  
  	update_thd(thd);
  
@@ -1027,7 +1027,7 @@
  	if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
-@@ -11941,6 +12038,26 @@
+@@ -11950,6 +12047,26 @@
    "dump file (if present). Disabled by default.",
    NULL, NULL, FALSE);
  
@@ -1054,7 +1054,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -12031,6 +12148,7 @@
+@@ -12040,6 +12157,7 @@
    MYSQL_SYSVAR(purge_threads),
    MYSQL_SYSVAR(purge_batch_size),
    MYSQL_SYSVAR(rollback_segments),
@@ -1175,7 +1175,7 @@
  #ifdef UNIV_DEBUG
 --- a/storage/innobase/include/fil0fil.h
 +++ b/storage/innobase/include/fil0fil.h
-@@ -750,6 +750,19 @@
+@@ -754,6 +754,19 @@
  fil_system_hash_nodes(void);
  /*========================*/
  

=== modified file 'patches/innodb_recovery_patches.patch'
--- patches/innodb_recovery_patches.patch	2011-11-14 10:30:04 +0000
+++ patches/innodb_recovery_patches.patch	2011-12-29 02:23:24 +0000
@@ -124,7 +124,7 @@
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
  
-@@ -11382,6 +11385,11 @@
+@@ -11391,6 +11394,11 @@
    "The common part for InnoDB table spaces.",
    NULL, NULL, NULL);
  
@@ -136,7 +136,7 @@
  static MYSQL_SYSVAR_BOOL(recovery_update_relay_log, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "During InnoDB crash recovery on slave overwrite relay-log.info "
-@@ -11870,6 +11878,7 @@
+@@ -11879,6 +11887,7 @@
    MYSQL_SYSVAR(data_file_path),
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),

=== modified file 'patches/innodb_separate_doublewrite.patch'
--- patches/innodb_separate_doublewrite.patch	2011-12-06 03:39:36 +0000
+++ patches/innodb_separate_doublewrite.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -3770,7 +3770,8 @@
+@@ -3805,7 +3805,8 @@
  		read_space_id = mach_read_from_4(
  			frame + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
  
@@ -262,7 +262,7 @@
  				if (err != DB_SUCCESS) {
  
  					return(err);
-@@ -4159,7 +4169,7 @@
+@@ -4168,7 +4178,7 @@
  	}
  
  #ifndef UNIV_HOTBACKUP
@@ -271,7 +271,7 @@
  		fprintf(stderr,
  			"InnoDB: Error: tablespace id %lu in file %s"
  			" is not sensible\n",
-@@ -4168,7 +4178,7 @@
+@@ -4177,7 +4187,7 @@
  		goto func_exit;
  	}
  #else
@@ -280,7 +280,7 @@
  		char*	new_path;
  
  		fprintf(stderr,
-@@ -4989,7 +4999,7 @@
+@@ -4998,7 +5008,7 @@
  	}
  
  	if (node->n_pending == 0 && space->purpose == FIL_TABLESPACE
@@ -289,7 +289,7 @@
  		/* The node is in the LRU list, remove it */
  
  		ut_a(UT_LIST_GET_LEN(system->LRU) > 0);
-@@ -5035,7 +5045,7 @@
+@@ -5044,7 +5054,7 @@
  	}
  
  	if (node->n_pending == 0 && node->space->purpose == FIL_TABLESPACE
@@ -298,7 +298,7 @@
  		/* The node must be put back to the LRU list */
  		UT_LIST_ADD_FIRST(LRU, system->LRU, node);
  	}
-@@ -5646,7 +5656,7 @@
+@@ -5655,7 +5665,7 @@
  		ut_a(fil_node->n_pending == 0);
  		ut_a(fil_node->open);
  		ut_a(fil_node->space->purpose == FIL_TABLESPACE);
@@ -350,7 +350,7 @@
  	srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
  
  	/* -------------- Log files ---------------------------*/
-@@ -11763,6 +11766,11 @@
+@@ -11772,6 +11775,11 @@
    "Path to individual files and their sizes.",
    NULL, NULL, NULL);
  
@@ -362,7 +362,7 @@
  static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "The AUTOINC lock modes supported by InnoDB:               "
-@@ -11942,6 +11950,7 @@
+@@ -11951,6 +11959,7 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),

=== modified file 'patches/innodb_show_lock_name.patch'
--- patches/innodb_show_lock_name.patch	2011-12-06 03:39:36 +0000
+++ patches/innodb_show_lock_name.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -9701,9 +9701,8 @@
+@@ -9710,9 +9710,8 @@
  			rw_lock_wait_time += mutex->lspent_time;
  		}
  #else /* UNIV_DEBUG */
@@ -19,7 +19,7 @@
  		buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
  				     (ulong) mutex->count_os_wait);
  
-@@ -9718,10 +9717,8 @@
+@@ -9727,10 +9726,8 @@
  
  	if (block_mutex) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -32,7 +32,7 @@
  		buf2len = (uint) my_snprintf(buf2, sizeof buf2,
  					     "os_waits=%lu",
  					     (ulong) block_mutex_oswait_count);
-@@ -9750,9 +9747,8 @@
+@@ -9759,9 +9756,8 @@
  			continue;
  		}
  
@@ -44,7 +44,7 @@
  		buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
  				      (ulong) lock->count_os_wait);
  
-@@ -9766,10 +9762,8 @@
+@@ -9775,10 +9771,8 @@
  
  	if (block_lock) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,

=== modified file 'patches/innodb_show_status.patch'
--- patches/innodb_show_status.patch	2011-12-05 08:46:28 +0000
+++ patches/innodb_show_status.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -4330,6 +4330,7 @@
+@@ -4365,6 +4365,7 @@
  	}
  
  	total_info->pool_size += pool_info->pool_size;
@@ -15,7 +15,7 @@
  	total_info->lru_len += pool_info->lru_len;
  	total_info->old_lru_len += pool_info->old_lru_len;
  	total_info->free_list_len += pool_info->free_list_len;
-@@ -4395,6 +4396,8 @@
+@@ -4430,6 +4431,8 @@
  
  	pool_info->pool_size = buf_pool->curr_size;
  
@@ -24,7 +24,7 @@
  	pool_info->lru_len = UT_LIST_GET_LEN(buf_pool->LRU);
  
  	pool_info->old_lru_len = buf_pool->LRU_old_len;
-@@ -4516,14 +4519,16 @@
+@@ -4551,14 +4554,16 @@
  	ut_ad(pool_info);
  
  	fprintf(file,
@@ -101,7 +101,7 @@
    {"buffer_pool_pages_free",
    (char*) &export_vars.innodb_buffer_pool_pages_free,	  SHOW_LONG},
  #ifdef UNIV_DEBUG
-@@ -11199,6 +11201,16 @@
+@@ -11208,6 +11210,16 @@
    "Force InnoDB to not use next-key locking, to use only row-level locking.",
    NULL, NULL, FALSE);
  
@@ -118,7 +118,7 @@
  #ifdef UNIV_LOG_ARCHIVE
  static MYSQL_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11386,7 +11398,7 @@
+@@ -11395,7 +11407,7 @@
  
  static MYSQL_SYSVAR_STR(version, innodb_version_str,
    PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
@@ -127,7 +127,7 @@
  
  static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11486,6 +11498,8 @@
+@@ -11495,6 +11507,8 @@
    MYSQL_SYSVAR(thread_concurrency),
    MYSQL_SYSVAR(thread_sleep_delay),
    MYSQL_SYSVAR(autoinc_lock_mode),

=== modified file 'patches/innodb_show_status_extend.patch'
--- patches/innodb_show_status_extend.patch	2011-12-08 07:27:43 +0000
+++ patches/innodb_show_status_extend.patch	2011-12-29 02:23:24 +0000
@@ -157,7 +157,7 @@
  
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -469,6 +469,45 @@
+@@ -478,6 +478,45 @@
  }
  
  /******************************************************************//**

=== modified file 'patches/innodb_show_sys_tables.patch'
--- patches/innodb_show_sys_tables.patch	2011-12-16 09:37:26 +0000
+++ patches/innodb_show_sys_tables.patch	2011-12-29 02:23:24 +0000
@@ -39,7 +39,7 @@
  Determine the flags of a table described in SYS_TABLES.
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11899,7 +11899,14 @@
+@@ -11908,7 +11908,14 @@
  i_s_innodb_cmp,
  i_s_innodb_cmp_reset,
  i_s_innodb_cmpmem,

=== modified file 'patches/innodb_split_buf_pool_mutex.patch'
--- patches/innodb_split_buf_pool_mutex.patch	2011-12-08 08:06:52 +0000
+++ patches/innodb_split_buf_pool_mutex.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0cur.c
 +++ b/storage/innobase/btr/btr0cur.c
-@@ -4085,7 +4085,8 @@
+@@ -4070,7 +4070,8 @@
  
  	mtr_commit(mtr);
  
@@ -17,7 +17,7 @@
  	mutex_enter(&block->mutex);
  
  	/* Only free the block if it is still allocated to
-@@ -4096,16 +4097,21 @@
+@@ -4081,16 +4082,21 @@
  	    && buf_block_get_space(block) == space
  	    && buf_block_get_page_no(block) == page_no) {
  
@@ -449,7 +449,7 @@
  UNIV_INTERN mysql_pfs_key_t	flush_list_mutex_key;
  #endif /* UNIV_PFS_MUTEX */
  
-@@ -880,9 +885,13 @@
+@@ -890,9 +895,13 @@
  	block->page.in_zip_hash = FALSE;
  	block->page.in_flush_list = FALSE;
  	block->page.in_free_list = FALSE;
@@ -464,7 +464,7 @@
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
  	block->n_pointers = 0;
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
-@@ -980,9 +989,11 @@
+@@ -997,9 +1006,11 @@
  		memset(block->frame, '\0', UNIV_PAGE_SIZE);
  #endif
  		/* Add the block to the free list */
@@ -477,7 +477,7 @@
  		ut_ad(buf_pool_from_block(block) == buf_pool);
  
  		block++;
-@@ -1037,7 +1048,8 @@
+@@ -1054,7 +1065,8 @@
  	buf_chunk_t*	chunk = buf_pool->chunks;
  
  	ut_ad(buf_pool);
@@ -487,7 +487,7 @@
  	for (n = buf_pool->n_chunks; n--; chunk++) {
  
  		buf_block_t* block = buf_chunk_contains_zip(chunk, data);
-@@ -1143,9 +1155,21 @@
+@@ -1160,9 +1172,21 @@
  	------------------------------- */
  	mutex_create(buf_pool_mutex_key,
  		     &buf_pool->mutex, SYNC_BUF_POOL);
@@ -509,7 +509,7 @@
  	buf_pool_mutex_enter(buf_pool);
  
  	if (buf_pool_size > 0) {
-@@ -1158,6 +1182,8 @@
+@@ -1175,6 +1199,8 @@
  			mem_free(chunk);
  			mem_free(buf_pool);
  
@@ -518,7 +518,7 @@
  			buf_pool_mutex_exit(buf_pool);
  
  			return(DB_ERROR);
-@@ -1188,6 +1214,8 @@
+@@ -1205,6 +1231,8 @@
  
  	/* All fields are initialized by mem_zalloc(). */
  
@@ -527,7 +527,7 @@
  	buf_pool_mutex_exit(buf_pool);
  
  	return(DB_SUCCESS);
-@@ -1339,7 +1367,11 @@
+@@ -1374,7 +1402,11 @@
  	ulint		fold;
  	buf_pool_t*	buf_pool = buf_pool_from_bpage(bpage);
  
@@ -540,7 +540,7 @@
  	ut_ad(mutex_own(buf_page_get_mutex(bpage)));
  	ut_a(buf_page_get_io_fix(bpage) == BUF_IO_NONE);
  	ut_a(bpage->buf_fix_count == 0);
-@@ -1450,21 +1482,32 @@
+@@ -1485,21 +1517,32 @@
  	buf_page_t*	bpage;
  	ulint		i;
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
@@ -574,7 +574,7 @@
  	for (i = 0; i < BUF_POOL_WATCH_SIZE; i++) {
  		bpage = &buf_pool->watch[i];
  
-@@ -1488,10 +1531,12 @@
+@@ -1523,10 +1566,12 @@
  			bpage->space = space;
  			bpage->offset = offset;
  			bpage->buf_fix_count = 1;
@@ -588,7 +588,7 @@
  			return(NULL);
  		case BUF_BLOCK_ZIP_PAGE:
  			ut_ad(bpage->in_page_hash);
-@@ -1509,6 +1554,8 @@
+@@ -1544,6 +1589,8 @@
  	ut_error;
  
  	/* Fix compiler warning */
@@ -597,7 +597,7 @@
  	return(NULL);
  }
  
-@@ -1526,7 +1573,11 @@
+@@ -1561,7 +1608,11 @@
  					space, offset) */
  	buf_page_t*	watch)		/*!< in/out: sentinel for watch */
  {
@@ -610,7 +610,7 @@
  
  	HASH_DELETE(buf_page_t, hash, buf_pool->page_hash, fold, watch);
  	ut_d(watch->in_page_hash = FALSE);
-@@ -1548,28 +1599,31 @@
+@@ -1583,28 +1634,31 @@
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  	ulint		fold = buf_page_address_fold(space, offset);
  
@@ -646,7 +646,7 @@
  }
  
  /****************************************************************//**
-@@ -1589,14 +1643,16 @@
+@@ -1624,14 +1678,16 @@
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  	ulint		fold	= buf_page_address_fold(space, offset);
  
@@ -665,7 +665,7 @@
  
  	return(ret);
  }
-@@ -1613,13 +1669,15 @@
+@@ -1648,13 +1704,15 @@
  {
  	buf_pool_t*	buf_pool = buf_pool_from_bpage(bpage);
  
@@ -683,7 +683,7 @@
  }
  
  /********************************************************************//**
-@@ -1643,14 +1701,20 @@
+@@ -1678,14 +1736,20 @@
  	ut_a(buf_page_in_file(bpage));
  
  	if (buf_page_peek_if_too_old(bpage)) {
@@ -708,7 +708,7 @@
  	}
  }
  
-@@ -1667,7 +1731,8 @@
+@@ -1702,7 +1766,8 @@
  	buf_block_t*	block;
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
@@ -718,7 +718,7 @@
  
  	block = (buf_block_t*) buf_page_hash_get(buf_pool, space, offset);
  
-@@ -1676,7 +1741,8 @@
+@@ -1711,7 +1776,8 @@
  		block->check_index_page_at_flush = FALSE;
  	}
  
@@ -728,7 +728,7 @@
  }
  
  #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
-@@ -1696,7 +1762,8 @@
+@@ -1731,7 +1797,8 @@
  	buf_page_t*	bpage;
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
@@ -738,7 +738,7 @@
  
  	bpage = buf_page_hash_get(buf_pool, space, offset);
  
-@@ -1707,7 +1774,8 @@
+@@ -1742,7 +1809,8 @@
  		bpage->file_page_was_freed = TRUE;
  	}
  
@@ -748,7 +748,7 @@
  
  	return(bpage);
  }
-@@ -1728,7 +1796,8 @@
+@@ -1763,7 +1831,8 @@
  	buf_page_t*	bpage;
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
@@ -758,7 +758,7 @@
  
  	bpage = buf_page_hash_get(buf_pool, space, offset);
  
-@@ -1737,7 +1806,8 @@
+@@ -1772,7 +1841,8 @@
  		bpage->file_page_was_freed = FALSE;
  	}
  
@@ -768,7 +768,7 @@
  
  	return(bpage);
  }
-@@ -1769,8 +1839,9 @@
+@@ -1804,8 +1874,9 @@
  	buf_pool->stat.n_page_gets++;
  
  	for (;;) {
@@ -779,7 +779,7 @@
  		bpage = buf_page_hash_get(buf_pool, space, offset);
  		if (bpage) {
  			ut_ad(!buf_pool_watch_is_sentinel(buf_pool, bpage));
-@@ -1779,7 +1850,8 @@
+@@ -1814,7 +1885,8 @@
  
  		/* Page not in buf_pool: needs to be read from file */
  
@@ -789,7 +789,7 @@
  
  		buf_read_page(space, zip_size, offset);
  
-@@ -1791,10 +1863,15 @@
+@@ -1826,10 +1898,15 @@
  	if (UNIV_UNLIKELY(!bpage->zip.data)) {
  		/* There is no compressed page. */
  err_exit:
@@ -806,7 +806,7 @@
  	ut_ad(!buf_pool_watch_is_sentinel(buf_pool, bpage));
  
  	switch (buf_page_get_state(bpage)) {
-@@ -1803,24 +1880,43 @@
+@@ -1838,24 +1915,43 @@
  	case BUF_BLOCK_MEMORY:
  	case BUF_BLOCK_REMOVE_HASH:
  	case BUF_BLOCK_ZIP_FREE:
@@ -855,7 +855,7 @@
  		buf_block_buf_fix_inc((buf_block_t*) bpage,
  				      __FILE__, __LINE__);
  		goto got_block;
-@@ -1833,7 +1929,7 @@
+@@ -1868,7 +1964,7 @@
  	must_read = buf_page_get_io_fix(bpage) == BUF_IO_READ;
  	access_time = buf_page_is_accessed(bpage);
  
@@ -864,7 +864,7 @@
  
  	mutex_exit(block_mutex);
  
-@@ -2144,7 +2240,7 @@
+@@ -2179,7 +2275,7 @@
  	const buf_block_t*	block)		/*!< in: pointer to block,
  						not dereferenced */
  {
@@ -873,7 +873,7 @@
  
  	if (UNIV_UNLIKELY((((ulint) block) % sizeof *block) != 0)) {
  		/* The pointer should be aligned. */
-@@ -2180,6 +2276,7 @@
+@@ -2215,6 +2311,7 @@
  	ulint		fix_type;
  	ibool		must_read;
  	ulint		retries = 0;
@@ -881,7 +881,7 @@
  	buf_pool_t*	buf_pool = buf_pool_get(space, offset);
  
  	ut_ad(mtr);
-@@ -2213,18 +2310,24 @@
+@@ -2248,18 +2345,24 @@
  	fold = buf_page_address_fold(space, offset);
  loop:
  	block = guess;
@@ -908,7 +908,7 @@
  			block = guess = NULL;
  		} else {
  			ut_ad(!block->page.in_zip_hash);
-@@ -2233,12 +2336,19 @@
+@@ -2268,12 +2371,19 @@
  	}
  
  	if (block == NULL) {
@@ -928,7 +928,7 @@
  		block = NULL;
  	}
  
-@@ -2250,12 +2360,14 @@
+@@ -2285,12 +2395,14 @@
  				space, offset, fold);
  
  			if (UNIV_LIKELY_NULL(block)) {
@@ -945,7 +945,7 @@
  
  		if (mode == BUF_GET_IF_IN_POOL
  		    || mode == BUF_PEEK_IF_IN_POOL
-@@ -2308,7 +2420,8 @@
+@@ -2343,7 +2455,8 @@
  		/* The page is being read to buffer pool,
  		but we cannot wait around for the read to
  		complete. */
@@ -955,7 +955,7 @@
  
  		return(NULL);
  	}
-@@ -2318,38 +2431,49 @@
+@@ -2353,38 +2466,49 @@
  		ibool		success;
  
  	case BUF_BLOCK_FILE_PAGE:
@@ -1012,7 +1012,7 @@
  
  		{
  			buf_page_t*	hash_bpage;
-@@ -2362,35 +2486,47 @@
+@@ -2397,35 +2521,47 @@
  				while buf_pool->mutex was released.
  				Free the block that was allocated. */
  
@@ -1066,7 +1066,7 @@
  		buf_block_init_low(block);
  		block->lock_hash_val = lock_rec_hash(space, offset);
  
-@@ -2400,7 +2536,7 @@
+@@ -2435,7 +2571,7 @@
  		if (buf_page_get_state(&block->page)
  		    == BUF_BLOCK_ZIP_PAGE) {
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
@@ -1075,7 +1075,7 @@
  				       &block->page);
  #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
  			ut_ad(!block->page.in_flush_list);
-@@ -2418,18 +2554,23 @@
+@@ -2453,18 +2589,23 @@
  		/* Insert at the front of unzip_LRU list */
  		buf_unzip_LRU_add_block(block, FALSE);
  
@@ -1101,7 +1101,7 @@
  		buf_page_free_descriptor(bpage);
  
  		/* Decompress the page and apply buffered operations
-@@ -2443,12 +2584,15 @@
+@@ -2478,12 +2619,15 @@
  		}
  
  		/* Unfix and unlatch the block. */
@@ -1120,7 +1120,7 @@
  		rw_lock_x_unlock(&block->lock);
  
  		break;
-@@ -2464,7 +2608,7 @@
+@@ -2499,7 +2643,7 @@
  
  	ut_ad(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
  
@@ -1129,7 +1129,7 @@
  #if UNIV_WORD_SIZE == 4
  	/* On 32-bit systems, there is no padding in buf_page_t.  On
  	other systems, Valgrind could complain about uninitialized pad
-@@ -2477,8 +2621,8 @@
+@@ -2512,8 +2656,8 @@
  		/* Try to evict the block from the buffer pool, to use the
  		insert buffer (change buffer) as much as possible. */
  
@@ -1140,7 +1140,7 @@
  			if (mode == BUF_GET_IF_IN_POOL_OR_WATCH) {
  				/* Set the watch, as it would have
  				been set if the page were not in the
-@@ -2487,6 +2631,9 @@
+@@ -2522,6 +2666,9 @@
  					space, offset, fold);
  
  				if (UNIV_LIKELY_NULL(block)) {
@@ -1150,7 +1150,7 @@
  
  					/* The page entered the buffer
  					pool for some reason. Try to
-@@ -2494,7 +2641,7 @@
+@@ -2529,7 +2676,7 @@
  					goto got_block;
  				}
  			}
@@ -1159,7 +1159,7 @@
  			fprintf(stderr,
  				"innodb_change_buffering_debug evict %u %u\n",
  				(unsigned) space, (unsigned) offset);
-@@ -2516,13 +2663,14 @@
+@@ -2551,13 +2698,14 @@
  	ut_a(mode == BUF_GET_POSSIBLY_FREED
  	     || !block->page.file_page_was_freed);
  #endif
@@ -1176,7 +1176,7 @@
  
  	if (UNIV_LIKELY(mode != BUF_PEEK_IF_IN_POOL)) {
  		buf_page_set_accessed_make_young(&block->page, access_time);
-@@ -2755,9 +2903,11 @@
+@@ -2790,9 +2938,11 @@
  	buf_pool = buf_pool_from_block(block);
  
  	if (mode == BUF_MAKE_YOUNG && buf_page_peek_if_too_old(&block->page)) {
@@ -1190,7 +1190,7 @@
  	} else if (!buf_page_is_accessed(&block->page)) {
  		/* Above, we do a dirty read on purpose, to avoid
  		mutex contention.  The field buf_page_t::access_time
-@@ -2765,9 +2915,11 @@
+@@ -2800,9 +2950,11 @@
  		field must be protected by mutex, however. */
  		ulint	time_ms = ut_time_ms();
  
@@ -1204,7 +1204,7 @@
  	}
  
  	ut_ad(!ibuf_inside(mtr) || mode == BUF_KEEP_OLD);
-@@ -2834,18 +2986,21 @@
+@@ -2869,18 +3021,21 @@
  	ut_ad(mtr);
  	ut_ad(mtr->state == MTR_ACTIVE);
  
@@ -1229,7 +1229,7 @@
  
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  	ut_a(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
-@@ -2935,7 +3090,10 @@
+@@ -2970,7 +3125,10 @@
  	buf_page_t*	hash_page;
  
  	ut_ad(buf_pool == buf_pool_get(space, offset));
@@ -1241,7 +1241,7 @@
  	ut_ad(mutex_own(&(block->mutex)));
  	ut_a(buf_block_get_state(block) != BUF_BLOCK_FILE_PAGE);
  
-@@ -2964,11 +3122,14 @@
+@@ -2999,11 +3157,14 @@
  	if (UNIV_LIKELY(!hash_page)) {
  	} else if (buf_pool_watch_is_sentinel(buf_pool, hash_page)) {
  		/* Preserve the reference count. */
@@ -1257,7 +1257,7 @@
  	} else {
  		fprintf(stderr,
  			"InnoDB: Error: page %lu %lu already found"
-@@ -2978,7 +3139,8 @@
+@@ -3013,7 +3174,8 @@
  			(const void*) hash_page, (const void*) block);
  #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
  		mutex_exit(&block->mutex);
@@ -1267,7 +1267,7 @@
  		buf_print();
  		buf_LRU_print();
  		buf_validate();
-@@ -3061,7 +3223,9 @@
+@@ -3096,7 +3258,9 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -1278,7 +1278,7 @@
  
  	watch_page = buf_page_hash_get_low(buf_pool, space, offset, fold);
  	if (watch_page && !buf_pool_watch_is_sentinel(buf_pool, watch_page)) {
-@@ -3070,9 +3234,15 @@
+@@ -3105,9 +3269,15 @@
  err_exit:
  		if (block) {
  			mutex_enter(&block->mutex);
@@ -1295,7 +1295,7 @@
  
  		bpage = NULL;
  		goto func_exit;
-@@ -3095,6 +3265,8 @@
+@@ -3130,6 +3300,8 @@
  
  		buf_page_init(buf_pool, space, offset, fold, block);
  
@@ -1304,7 +1304,7 @@
  		/* The block must be put to the LRU list, to the old blocks */
  		buf_LRU_add_block(bpage, TRUE/* to old blocks */);
  
-@@ -3122,7 +3294,7 @@
+@@ -3157,7 +3329,7 @@
  			been added to buf_pool->LRU and
  			buf_pool->page_hash. */
  			mutex_exit(&block->mutex);
@@ -1313,7 +1313,7 @@
  			mutex_enter(&block->mutex);
  			block->page.zip.data = data;
  
-@@ -3135,13 +3307,14 @@
+@@ -3170,13 +3342,14 @@
  			buf_unzip_LRU_add_block(block, TRUE);
  		}
  
@@ -1329,7 +1329,7 @@
  
  		/* If buf_buddy_alloc() allocated storage from the LRU list,
  		it released and reacquired buf_pool->mutex.  Thus, we must
-@@ -3157,7 +3330,10 @@
+@@ -3192,7 +3365,10 @@
  
  				/* The block was added by some other thread. */
  				watch_page = NULL;
@@ -1341,7 +1341,7 @@
  
  				bpage = NULL;
  				goto func_exit;
-@@ -3205,20 +3381,26 @@
+@@ -3240,20 +3416,26 @@
  		HASH_INSERT(buf_page_t, hash, buf_pool->page_hash, fold,
  			    bpage);
  
@@ -1369,7 +1369,7 @@
  
  	if (mode == BUF_READ_IBUF_PAGES_ONLY) {
  
-@@ -3260,7 +3442,9 @@
+@@ -3295,7 +3477,9 @@
  
  	fold = buf_page_address_fold(space, offset);
  
@@ -1380,7 +1380,7 @@
  
  	block = (buf_block_t*) buf_page_hash_get_low(
  		buf_pool, space, offset, fold);
-@@ -3276,7 +3460,9 @@
+@@ -3311,7 +3495,9 @@
  #endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
  
  		/* Page can be found in buf_pool */
@@ -1391,7 +1391,7 @@
  
  		buf_block_free(free_block);
  
-@@ -3298,6 +3484,7 @@
+@@ -3333,6 +3519,7 @@
  	mutex_enter(&block->mutex);
  
  	buf_page_init(buf_pool, space, offset, fold, block);
@@ -1399,7 +1399,7 @@
  
  	/* The block must be put to the LRU list */
  	buf_LRU_add_block(&block->page, FALSE);
-@@ -3324,7 +3511,7 @@
+@@ -3359,7 +3546,7 @@
  		the reacquisition of buf_pool->mutex.  We also must
  		defer this operation until after the block descriptor
  		has been added to buf_pool->LRU and buf_pool->page_hash. */
@@ -1408,7 +1408,7 @@
  		mutex_enter(&block->mutex);
  		block->page.zip.data = data;
  
-@@ -3342,7 +3529,8 @@
+@@ -3377,7 +3564,8 @@
  
  	buf_page_set_accessed(&block->page, time_ms);
  
@@ -1418,7 +1418,7 @@
  
  	mtr_memo_push(mtr, block, MTR_MEMO_BUF_FIX);
  
-@@ -3397,7 +3585,9 @@
+@@ -3432,7 +3620,9 @@
  	ibool		ret = TRUE;
  
  	/* First unfix and release lock on the bpage */
@@ -1429,7 +1429,7 @@
  	mutex_enter(buf_page_get_mutex(bpage));
  	ut_ad(buf_page_get_io_fix(bpage) == BUF_IO_READ);
  	ut_ad(bpage->buf_fix_count == 0);
-@@ -3418,11 +3608,15 @@
+@@ -3453,11 +3643,15 @@
  		ret = FALSE;
  	}
  
@@ -1446,7 +1446,7 @@
  
  	return(ret);
  }
-@@ -3440,6 +3634,8 @@
+@@ -3475,6 +3669,8 @@
  	buf_pool_t*	buf_pool = buf_pool_from_bpage(bpage);
  	const ibool	uncompressed = (buf_page_get_state(bpage)
  					== BUF_BLOCK_FILE_PAGE);
@@ -1455,7 +1455,7 @@
  
  	ut_a(buf_page_in_file(bpage));
  
-@@ -3582,8 +3778,26 @@
+@@ -3617,8 +3813,26 @@
  		}
  	}
  
@@ -1483,7 +1483,7 @@
  
  #ifdef UNIV_IBUF_COUNT_DEBUG
  	if (io_type == BUF_IO_WRITE || uncompressed) {
-@@ -3606,6 +3820,7 @@
+@@ -3641,6 +3855,7 @@
  		the x-latch to this OS thread: do not let this confuse you in
  		debugging! */
  
@@ -1491,7 +1491,7 @@
  		ut_ad(buf_pool->n_pend_reads > 0);
  		buf_pool->n_pend_reads--;
  		buf_pool->stat.n_pages_read++;
-@@ -3623,6 +3838,9 @@
+@@ -3658,6 +3873,9 @@
  
  		buf_flush_write_complete(bpage);
  
@@ -1501,7 +1501,7 @@
  		if (uncompressed) {
  			rw_lock_s_unlock_gen(&((buf_block_t*) bpage)->lock,
  					     BUF_IO_WRITE);
-@@ -3645,8 +3863,8 @@
+@@ -3680,8 +3898,8 @@
  	}
  #endif /* UNIV_DEBUG */
  
@@ -1511,7 +1511,7 @@
  }
  
  /*********************************************************************//**
-@@ -3663,7 +3881,9 @@
+@@ -3698,7 +3916,9 @@
  
  	ut_ad(buf_pool);
  
@@ -1522,7 +1522,7 @@
  
  	chunk = buf_pool->chunks;
  
-@@ -3680,7 +3900,9 @@
+@@ -3715,7 +3935,9 @@
  		}
  	}
  
@@ -1533,7 +1533,7 @@
  
  	return(TRUE);
  }
-@@ -3728,7 +3950,8 @@
+@@ -3763,7 +3985,8 @@
  		freed = buf_LRU_search_and_free_block(buf_pool, 100);
  	}
  
@@ -1543,7 +1543,7 @@
  
  	ut_ad(UT_LIST_GET_LEN(buf_pool->LRU) == 0);
  	ut_ad(UT_LIST_GET_LEN(buf_pool->unzip_LRU) == 0);
-@@ -3741,7 +3964,8 @@
+@@ -3776,7 +3999,8 @@
  	memset(&buf_pool->stat, 0x00, sizeof(buf_pool->stat));
  	buf_refresh_io_stats(buf_pool);
  
@@ -1553,7 +1553,7 @@
  }
  
  /*********************************************************************//**
-@@ -3783,7 +4007,10 @@
+@@ -3818,7 +4042,10 @@
  
  	ut_ad(buf_pool);
  
@@ -1565,7 +1565,7 @@
  
  	chunk = buf_pool->chunks;
  
-@@ -3878,7 +4105,7 @@
+@@ -3913,7 +4140,7 @@
  	/* Check clean compressed-only blocks. */
  
  	for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b;
@@ -1574,7 +1574,7 @@
  		ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE);
  		switch (buf_page_get_io_fix(b)) {
  		case BUF_IO_NONE:
-@@ -3909,7 +4136,7 @@
+@@ -3944,7 +4171,7 @@
  
  	buf_flush_list_mutex_enter(buf_pool);
  	for (b = UT_LIST_GET_FIRST(buf_pool->flush_list); b;
@@ -1583,7 +1583,7 @@
  		ut_ad(b->in_flush_list);
  		ut_a(b->oldest_modification);
  		n_flush++;
-@@ -3968,6 +4195,8 @@
+@@ -4003,6 +4230,8 @@
  	}
  
  	ut_a(UT_LIST_GET_LEN(buf_pool->LRU) == n_lru);
@@ -1592,7 +1592,7 @@
  	if (UT_LIST_GET_LEN(buf_pool->free) != n_free) {
  		fprintf(stderr, "Free list len %lu, free blocks %lu\n",
  			(ulong) UT_LIST_GET_LEN(buf_pool->free),
-@@ -3978,8 +4207,11 @@
+@@ -4013,8 +4242,11 @@
  	ut_a(buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE] == n_single_flush);
  	ut_a(buf_pool->n_flush[BUF_FLUSH_LIST] == n_list_flush);
  	ut_a(buf_pool->n_flush[BUF_FLUSH_LRU] == n_lru_flush);
@@ -1605,7 +1605,7 @@
  
  	ut_a(buf_LRU_validate());
  	ut_a(buf_flush_validate(buf_pool));
-@@ -4035,7 +4267,9 @@
+@@ -4070,7 +4302,9 @@
  	index_ids = mem_alloc(size * sizeof *index_ids);
  	counts = mem_alloc(sizeof(ulint) * size);
  
@@ -1616,7 +1616,7 @@
  	buf_flush_list_mutex_enter(buf_pool);
  
  	fprintf(stderr,
-@@ -4104,7 +4338,9 @@
+@@ -4139,7 +4373,9 @@
  		}
  	}
  
@@ -1627,7 +1627,7 @@
  
  	for (i = 0; i < n_found; i++) {
  		index = dict_index_get_if_in_cache(index_ids[i]);
-@@ -4161,7 +4397,7 @@
+@@ -4196,7 +4432,7 @@
  	buf_chunk_t*	chunk;
  	ulint		fixed_pages_number = 0;
  
@@ -1636,7 +1636,7 @@
  
  	chunk = buf_pool->chunks;
  
-@@ -4195,7 +4431,7 @@
+@@ -4230,7 +4466,7 @@
  	/* Traverse the lists of clean and dirty compressed-only blocks. */
  
  	for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b;
@@ -1645,7 +1645,7 @@
  		ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE);
  		ut_a(buf_page_get_io_fix(b) != BUF_IO_WRITE);
  
-@@ -4207,7 +4443,7 @@
+@@ -4242,7 +4478,7 @@
  
  	buf_flush_list_mutex_enter(buf_pool);
  	for (b = UT_LIST_GET_FIRST(buf_pool->flush_list); b;
@@ -1654,7 +1654,7 @@
  		ut_ad(b->in_flush_list);
  
  		switch (buf_page_get_state(b)) {
-@@ -4233,7 +4469,7 @@
+@@ -4268,7 +4504,7 @@
  
  	buf_flush_list_mutex_exit(buf_pool);
  	mutex_exit(&buf_pool->zip_mutex);
@@ -1663,7 +1663,7 @@
  
  	return(fixed_pages_number);
  }
-@@ -4391,6 +4627,8 @@
+@@ -4426,6 +4662,8 @@
  	/* Find appropriate pool_info to store stats for this buffer pool */
  	pool_info = &all_pool_info[pool_id];
  
@@ -1672,7 +1672,7 @@
  	buf_pool_mutex_enter(buf_pool);
  	buf_flush_list_mutex_enter(buf_pool);
  
-@@ -4506,6 +4744,8 @@
+@@ -4541,6 +4779,8 @@
  	pool_info->unzip_cur = buf_LRU_stat_cur.unzip;
  
  	buf_refresh_io_stats(buf_pool);
@@ -1681,7 +1681,7 @@
  	buf_pool_mutex_exit(buf_pool);
  }
  
-@@ -4750,11 +4990,13 @@
+@@ -4785,11 +5025,13 @@
  {
  	ulint	len;
  
@@ -3149,7 +3149,7 @@
  			break;
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
-@@ -3821,9 +3821,11 @@
+@@ -3760,9 +3760,11 @@
  		ulint		fold = buf_page_address_fold(space, page_no);
  		buf_pool_t*	buf_pool = buf_pool_get(space, page_no);
  

=== modified file 'patches/innodb_stats.patch'
--- patches/innodb_stats.patch	2011-12-16 09:37:26 +0000
+++ patches/innodb_stats.patch	2011-12-29 02:23:24 +0000
@@ -278,16 +278,10 @@
  	}
  
  	if (node->state == INDEX_CREATE_INDEX_TREE) {
-@@ -1177,6 +1316,66 @@
- 		return(NULL);
- 	}
+@@ -1183,6 +1322,66 @@
+ }
  
-+	thr->run_node = que_node_get_parent(node);
-+
-+	return(thr);
-+}
-+
-+/****************************************************************//**
+ /****************************************************************//**
 +*/
 +UNIV_INTERN
 +que_thr_t*
@@ -342,9 +336,15 @@
 +		return(NULL);
 +	}
 +
- 	thr->run_node = que_node_get_parent(node);
- 
- 	return(thr);
++	thr->run_node = que_node_get_parent(node);
++
++	return(thr);
++}
++
++/****************************************************************//**
+ Creates the foreign key constraints system tables inside InnoDB
+ at database creation or database start if they are not found or are
+ not of the right form.
 --- a/storage/innobase/dict/dict0dict.c
 +++ b/storage/innobase/dict/dict0dict.c
 @@ -755,7 +755,7 @@
@@ -927,7 +927,7 @@
  	/* Handle duplicate key errors */
  	if (auto_inc_used) {
  		ulint		err;
-@@ -5593,6 +5600,10 @@
+@@ -5591,6 +5598,10 @@
  		}
  	}
  
@@ -938,7 +938,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(error,
-@@ -5646,6 +5657,10 @@
+@@ -5644,6 +5655,10 @@
  
  	error = row_update_for_mysql((byte*) record, prebuilt);
  
@@ -949,7 +949,7 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(
-@@ -5966,6 +5981,11 @@
+@@ -5965,6 +5980,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -961,7 +961,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_KEY_NOT_FOUND;
-@@ -6198,6 +6218,11 @@
+@@ -6197,6 +6217,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -973,7 +973,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_END_OF_FILE;
-@@ -8144,11 +8169,35 @@
+@@ -8150,11 +8175,35 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
@@ -1010,7 +1010,7 @@
  
  			prebuilt->trx->op_info = "returning various info to MySQL";
  		}
-@@ -8233,7 +8282,7 @@
+@@ -8239,7 +8288,7 @@
  		are asked by MySQL to avoid locking. Another reason to
  		avoid the call is that it uses quite a lot of CPU.
  		See Bug#38185. */
@@ -1019,7 +1019,7 @@
  		    || !(flag & HA_STATUS_VARIABLE_EXTRA)) {
  			/* We do not update delete_length if no
  			locking is requested so the "old" value can
-@@ -11503,6 +11552,26 @@
+@@ -11512,6 +11561,26 @@
    "The number of index pages to sample when calculating statistics (default 8)",
    NULL, NULL, 8, 1, ~0ULL, 0);
  
@@ -1046,7 +1046,7 @@
  static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
    PLUGIN_VAR_OPCMDARG,
    "Enable InnoDB adaptive hash index (enabled by default).  "
-@@ -11835,6 +11904,9 @@
+@@ -11844,6 +11913,9 @@
    MYSQL_SYSVAR(recovery_update_relay_log),
    MYSQL_SYSVAR(rollback_on_timeout),
    MYSQL_SYSVAR(stats_on_metadata),
@@ -1056,7 +1056,7 @@
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
    MYSQL_SYSVAR(stats_method),
-@@ -11906,7 +11978,10 @@
+@@ -11915,7 +11987,10 @@
  i_s_innodb_sys_columns,
  i_s_innodb_sys_fields,
  i_s_innodb_sys_foreign,
@@ -1306,7 +1306,7 @@
  static ST_FIELD_INFO	i_s_innodb_rseg_fields_info[] =
 @@ -3677,3 +3897,349 @@
  	/* unsigned long */
- 	STRUCT_FLD(flags, 0UL)
+ 	STRUCT_FLD(flags, 0UL),
  };
 +
 +/***********************************************************************

=== modified file 'patches/innodb_thread_concurrency_timer_based.patch'
--- patches/innodb_thread_concurrency_timer_based.patch	2011-12-13 15:06:50 +0000
+++ patches/innodb_thread_concurrency_timer_based.patch	2011-12-29 02:23:24 +0000
@@ -25,7 +25,7 @@
  #ifdef UNIV_LOG_ARCHIVE
  	srv_log_archive_on = (ulint) innobase_log_archive;
  #endif /* UNIV_LOG_ARCHIVE */
-@@ -11593,6 +11597,12 @@
+@@ -11602,6 +11606,12 @@
    "Maximum delay between polling for a spin lock (6 by default)",
    NULL, NULL, 6L, 0L, ~0L, 0);
  
@@ -38,7 +38,7 @@
  static MYSQL_SYSVAR_ULONG(thread_concurrency, srv_thread_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.",
-@@ -11811,6 +11821,7 @@
+@@ -11820,6 +11830,7 @@
    MYSQL_SYSVAR(spin_wait_delay),
    MYSQL_SYSVAR(table_locks),
    MYSQL_SYSVAR(thread_concurrency),

=== modified file 'patches/log_warnings_suppress.patch'
--- patches/log_warnings_suppress.patch	2011-12-13 13:49:04 +0000
+++ patches/log_warnings_suppress.patch	2011-12-29 02:23:24 +0000
@@ -41,7 +41,7 @@
    using my_pthread_setspecific_ptr()/my_thread_getspecific_ptr().
 --- a/sql/sql_class.cc
 +++ b/sql/sql_class.cc
-@@ -4931,7 +4931,7 @@
+@@ -5024,7 +5024,7 @@
                            ER_BINLOG_UNSAFE_STATEMENT,
                            ER(ER_BINLOG_UNSAFE_STATEMENT),
                            ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type]));
@@ -52,7 +52,7 @@
          sprintf(buf, ER(ER_BINLOG_UNSAFE_STATEMENT),
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -90,6 +90,7 @@
+@@ -87,6 +87,7 @@
    SLOG_F_TMP_TABLE, SLOG_F_TMP_DISK, SLOG_F_FILESORT,
    SLOG_F_FILESORT_DISK
  };
@@ -62,7 +62,7 @@
                              SLAVE_EXEC_MODE_LAST_BIT};
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -1493,6 +1493,15 @@
+@@ -1499,6 +1499,15 @@
         READ_ONLY GLOBAL_VAR(mysqld_port), CMD_LINE(REQUIRED_ARG, 'P'),
         VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1));
  
@@ -178,7 +178,7 @@
   --long-query-time=# Log all queries that have taken more than long_query_time
   seconds to execute to file. The argument will be treated
   as a decimal value with microsecond precision
-@@ -863,6 +866,7 @@
+@@ -865,6 +868,7 @@
  log-tc tc.log
  log-tc-size 24576
  log-warnings 1

=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff	2011-12-13 13:49:04 +0000
+++ patches/mysql-test.diff	2011-12-29 02:23:24 +0000
@@ -1049,7 +1049,7 @@
 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
 --- /dev/null
 +++ b/mysql-test/r/percona_server_variables_debug.result
-@@ -0,0 +1,380 @@
+@@ -0,0 +1,381 @@
 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
 +Variable_name
 +AUTOCOMMIT
@@ -1280,6 +1280,7 @@
 +MAX_TMP_TABLES
 +MAX_USER_CONNECTIONS
 +MAX_WRITE_LOCK_COUNT
++METADATA_LOCKS_CACHE_SIZE
 +MIN_EXAMINED_ROW_LIMIT
 +MULTI_RANGE_COUNT
 +MYISAM_DATA_POINTER_SIZE
@@ -1432,7 +1433,7 @@
 +WARNING_COUNT
 --- /dev/null
 +++ b/mysql-test/r/percona_server_variables_release.result
-@@ -0,0 +1,376 @@
+@@ -0,0 +1,377 @@
 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
 +Variable_name
 +AUTOCOMMIT
@@ -1660,6 +1661,7 @@
 +MAX_TMP_TABLES
 +MAX_USER_CONNECTIONS
 +MAX_WRITE_LOCK_COUNT
++METADATA_LOCKS_CACHE_SIZE
 +MIN_EXAMINED_ROW_LIMIT
 +MULTI_RANGE_COUNT
 +MYISAM_DATA_POINTER_SIZE
@@ -1819,3 +1821,7 @@
 @@ -0,0 +1,2 @@
 +--source include/have_nodebug.inc
 +--source include/percona_server_variables.inc
+--- a/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
++++ /dev/null
+@@ -1 +0,0 @@
+---innodb-buffer-pool-size=8M

=== modified file 'patches/optimizer_fix.patch'
--- patches/optimizer_fix.patch	2011-08-09 20:52:20 +0000
+++ patches/optimizer_fix.patch	2011-12-29 02:23:24 +0000
@@ -138,7 +138,7 @@
    DBUG_RETURN(HA_POS_ERROR);			/* This shouldn't happend */
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -2180,6 +2180,12 @@
+@@ -2186,6 +2186,12 @@
         VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
         DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
  

=== modified file 'patches/processlist_row_stats.patch'
--- patches/processlist_row_stats.patch	2011-12-13 13:49:04 +0000
+++ patches/processlist_row_stats.patch	2011-12-29 02:23:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/sql/sql_class.cc
 +++ b/sql/sql_class.cc
-@@ -2326,6 +2326,7 @@
+@@ -2419,6 +2419,7 @@
  
    thd->sent_row_count++;
    thd->sent_row_count_2++;

=== modified file 'patches/query_cache_enhance.patch'
--- patches/query_cache_enhance.patch	2011-12-16 09:37:26 +0000
+++ patches/query_cache_enhance.patch	2011-12-29 02:23:24 +0000
@@ -542,7 +542,7 @@
  #ifdef EMBEDDED_LIBRARY
  #include "emb_qcache.h"
  #endif
-@@ -454,7 +939,12 @@
+@@ -454,7 +944,12 @@
    Query_cache_wait_state wait_state(thd, __func__, __FILE__, __LINE__);
    DBUG_ENTER("Query_cache::try_lock");
  
@@ -555,7 +555,7 @@
    while (1)
    {
      if (m_cache_lock_status == Query_cache::UNLOCKED)
-@@ -1274,6 +1764,8 @@
+@@ -1274,6 +1769,8 @@
        unlock();
        DBUG_VOID_RETURN;
      }
@@ -564,7 +564,7 @@
  
      /* Key is query + database + flag */
      if (thd->db_length)
-@@ -1440,7 +1932,7 @@
+@@ -1440,7 +1937,7 @@
  */
  
  int
@@ -573,7 +573,7 @@
  {
    ulonglong engine_data;
    Query_cache_query *query;
-@@ -1452,6 +1944,11 @@
+@@ -1452,6 +1949,11 @@
    ulong tot_length;
    Query_cache_query_flags flags;
    DBUG_ENTER("Query_cache::send_result_to_client");
@@ -585,7 +585,7 @@
  
    /*
      Testing 'query_cache_size' without a lock here is safe: the thing
-@@ -1471,13 +1968,7 @@
+@@ -1471,13 +1973,7 @@
    }
  
    {
@@ -600,7 +600,7 @@
  
      /*
        Test if the query is a SELECT
-@@ -1487,10 +1978,11 @@
+@@ -1487,10 +1983,11 @@
        frequently appeared in real life, consequently we can
        check all such queries, too.
      */
@@ -616,7 +616,7 @@
      {
        DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached"));
        goto err;
-@@ -1543,6 +2035,7 @@
+@@ -1543,6 +2040,7 @@
      goto err_unlock;
  
    Query_cache_block *query_block;
@@ -624,7 +624,7 @@
  
    tot_length= query_length + 1 + sizeof(size_t) + 
                thd->db_length + QUERY_CACHE_FLAGS_SIZE;
-@@ -1611,6 +2104,7 @@
+@@ -1611,6 +2109,7 @@
  	 (uchar*) &flags, QUERY_CACHE_FLAGS_SIZE);
    query_block = (Query_cache_block *)  my_hash_search(&queries, (uchar*) sql,
                                                        tot_length);
@@ -634,7 +634,7 @@
        query_block->query()->result() == 0 ||
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -1487,6 +1487,74 @@
+@@ -1485,6 +1485,74 @@
  
  extern "C" void my_message_sql(uint error, const char *str, myf MyFlags);
  
@@ -709,7 +709,7 @@
  /**
    @class THD
    For each client connection we create a separate thread with THD serving as
-@@ -1544,6 +1612,7 @@
+@@ -1542,6 +1610,7 @@
    struct st_mysql_stmt *current_stmt;
  #endif
  #ifdef HAVE_QUERY_CACHE
@@ -719,7 +719,7 @@
    NET	  net;				// client connection descriptor
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -1809,6 +1809,11 @@
+@@ -1815,6 +1815,11 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_query_cache_size));
  
@@ -3735,7 +3735,7 @@
 +SET GLOBAL query_cache_size=0;
 --- a/mysql-test/r/mysqld--help-notwin.result
 +++ b/mysql-test/r/mysqld--help-notwin.result
-@@ -491,6 +491,10 @@
+@@ -493,6 +493,10 @@
   The minimum size for blocks allocated by the query cache
   --query-cache-size=# 
   The memory allocated to store results from old queries
@@ -3746,7 +3746,7 @@
   --query-cache-type=name 
   OFF = Don't cache or retrieve results. ON = Cache all
   results except SELECT SQL_NO_CACHE ... queries. DEMAND =
-@@ -928,6 +932,7 @@
+@@ -931,6 +935,7 @@
  query-cache-limit 1048576
  query-cache-min-res-unit 4096
  query-cache-size 0

=== modified file 'patches/response_time_distribution.patch'
--- patches/response_time_distribution.patch	2011-12-14 11:42:46 +0000
+++ patches/response_time_distribution.patch	2011-12-29 02:23:24 +0000
@@ -3533,7 +3533,7 @@
  /*
    This forward declaration is needed because including sql_base.h
    causes further includes.  [TODO] Eliminate this forward declaration
-@@ -1860,6 +1861,26 @@
+@@ -1866,6 +1867,26 @@
         DEFAULT(FALSE));
  #endif /* HAVE_QUERY_CACHE */
  
@@ -3609,7 +3609,7 @@
  /*
 --- a/mysql-test/r/mysqld--help-notwin.result
 +++ b/mysql-test/r/mysqld--help-notwin.result
-@@ -503,6 +503,12 @@
+@@ -505,6 +505,12 @@
   Invalidate queries in query cache on LOCK for write
   --query-prealloc-size=# 
   Persistent buffer for query parsing and execution
@@ -3622,7 +3622,7 @@
   --range-alloc-block-size=# 
   Allocation block size for storing ranges during
   optimization
-@@ -936,6 +942,8 @@
+@@ -939,6 +945,8 @@
  query-cache-type ON
  query-cache-wlock-invalidate FALSE
  query-prealloc-size 8192

=== modified file 'patches/show_temp.patch'
--- patches/show_temp.patch	2011-12-05 08:45:03 +0000
+++ patches/show_temp.patch	2011-12-29 02:23:24 +0000
@@ -506,7 +506,7 @@
  #endif  
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -1004,6 +1004,11 @@
+@@ -1002,6 +1002,11 @@
      XXX Why are internal temporary tables added to this list?
    */
    TABLE *temporary_tables;

=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch	2011-12-13 15:06:50 +0000
+++ patches/slow_extended.patch	2011-12-29 02:23:24 +0000
@@ -382,7 +382,7 @@
               const char *user_host, uint user_host_len,
               ulonglong query_utime, ulonglong lock_utime, bool is_command,
               const char *sql_text, uint sql_text_len);
-@@ -515,7 +515,7 @@
+@@ -517,7 +517,7 @@
    virtual bool init()= 0;
    virtual void cleanup()= 0;
  
@@ -391,7 +391,7 @@
                          time_t query_start_arg, const char *user_host,
                          uint user_host_len, ulonglong query_utime,
                          ulonglong lock_utime, bool is_command,
-@@ -544,7 +544,7 @@
+@@ -546,7 +546,7 @@
    virtual bool init();
    virtual void cleanup();
  
@@ -400,7 +400,7 @@
                          time_t query_start_arg, const char *user_host,
                          uint user_host_len, ulonglong query_utime,
                          ulonglong lock_utime, bool is_command,
-@@ -576,7 +576,7 @@
+@@ -578,7 +578,7 @@
    virtual bool init();
    virtual void cleanup();
  
@@ -484,7 +484,7 @@
    mysql_mutex_lock(&LOCK_thread_count);
 --- a/sql/sp_head.cc
 +++ b/sql/sp_head.cc
-@@ -2152,7 +2152,7 @@
+@@ -2164,7 +2164,7 @@
      DBUG_PRINT("info",(" %.*s: eval args done", (int) m_name.length, 
                         m_name.str));
    }
@@ -495,7 +495,7 @@
      save_enable_slow_log= true;
 --- a/sql/sql_cache.cc
 +++ b/sql/sql_cache.cc
-@@ -1756,6 +1756,7 @@
+@@ -1780,6 +1780,7 @@
      response, we can't handle it anyway.
    */
    (void) trans_commit_stmt(thd);
@@ -503,7 +503,7 @@
    if (!thd->stmt_da->is_set())
      thd->stmt_da->disable_status();
  
-@@ -1766,6 +1767,7 @@
+@@ -1790,6 +1791,7 @@
  err_unlock:
    unlock();
  err:
@@ -717,7 +717,7 @@
  enum enum_slave_exec_mode { SLAVE_EXEC_MODE_STRICT,
                              SLAVE_EXEC_MODE_IDEMPOTENT,
                              SLAVE_EXEC_MODE_LAST_BIT};
-@@ -508,6 +535,21 @@
+@@ -506,6 +533,21 @@
  
    my_bool sysdate_is_now;
  
@@ -739,7 +739,7 @@
    double long_query_time_double;
  
  } SV;
-@@ -1140,6 +1182,24 @@
+@@ -1138,6 +1180,24 @@
    uint in_sub_stmt;
    bool enable_slow_log;
    bool last_insert_id_used;
@@ -764,7 +764,7 @@
    SAVEPOINT *savepoints;
    enum enum_check_fields count_cuted_fields;
  };
-@@ -1588,6 +1648,71 @@
+@@ -1586,6 +1646,71 @@
    thr_lock_type update_lock_default;
    Delayed_insert *di;
  
@@ -864,7 +864,7 @@
  
  const char *any_db="*any*";	// Special symbol for check_access
  
-@@ -888,6 +889,7 @@
+@@ -890,6 +891,7 @@
      the slow log only if opt_log_slow_admin_statements is set.
    */
    thd->enable_slow_log= TRUE;
@@ -872,7 +872,7 @@
    thd->lex->sql_command= SQLCOM_END; /* to avoid confusing VIEW detectors */
    thd->set_time();
    if (!thd->is_valid_time())
-@@ -1430,6 +1432,60 @@
+@@ -1440,6 +1442,60 @@
    DBUG_RETURN(error);
  }
  
@@ -933,7 +933,7 @@
  
  void log_slow_statement(THD *thd)
  {
-@@ -1443,13 +1499,48 @@
+@@ -1453,13 +1509,48 @@
    if (unlikely(thd->in_sub_stmt))
      DBUG_VOID_RETURN;                           // Don't set time for sub stmt
  
@@ -983,7 +983,7 @@
      thd_proc_info(thd, "logging slow query");
  
      if (((thd->server_status & SERVER_QUERY_WAS_SLOW) ||
-@@ -5301,7 +5392,8 @@
+@@ -5368,7 +5459,8 @@
    thd->stmt_da->reset_diagnostics_area();
    thd->warning_info->reset_for_next_command();
    thd->rand_used= 0;
@@ -995,7 +995,7 @@
    thd->binlog_unsafe_warning_flags= 0;
 --- a/sql/sql_select.cc
 +++ b/sql/sql_select.cc
-@@ -6902,7 +6902,10 @@
+@@ -6912,7 +6912,10 @@
  	  {
  	    join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
  	    if (statistics)
@@ -1006,7 +1006,7 @@
  	  }
  	}
  	else
-@@ -6916,7 +6919,10 @@
+@@ -6926,7 +6929,10 @@
  	  {
  	    join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
  	    if (statistics)
@@ -1017,7 +1017,7 @@
  	  }
  	}
  	if (!table->no_keyread)
-@@ -10264,6 +10270,7 @@
+@@ -10274,6 +10280,7 @@
                (ulong) rows_limit,test(group)));
  
    status_var_increment(thd->status_var.created_tmp_tables);
@@ -1025,7 +1025,7 @@
  
    if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES))
      temp_pool_slot = bitmap_lock_set_next(&temp_pool);
-@@ -11162,6 +11169,7 @@
+@@ -11175,6 +11182,7 @@
      goto err;
    }
    status_var_increment(table->in_use->status_var.created_tmp_disk_tables);
@@ -1033,7 +1033,7 @@
    share->db_record_offset= 1;
    DBUG_RETURN(0);
   err:
-@@ -11180,6 +11188,14 @@
+@@ -11193,6 +11201,14 @@
    save_proc_info=thd->proc_info;
    thd_proc_info(thd, "removing tmp table");
  
@@ -1102,7 +1102,7 @@
  static bool fix_low_prio_updates(sys_var *self, THD *thd, enum_var_type type)
  {
    if (type == OPT_SESSION)
-@@ -2898,6 +2921,123 @@
+@@ -2904,6 +2927,123 @@
         DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_log_state));
  
@@ -2483,7 +2483,7 @@
        CHECK_SPACE(pos, end, 1);
 --- a/sql/log_event.h
 +++ b/sql/log_event.h
-@@ -342,6 +342,10 @@
+@@ -343,6 +343,10 @@
  
  #define Q_INVOKER 11
  
@@ -2729,7 +2729,7 @@
   --log-tc=name       Path to transaction coordinator log (used for
   transactions that affect more than one storage engine,
   when binary log is disabled).
-@@ -660,6 +676,18 @@
+@@ -662,6 +678,18 @@
   Log slow queries to given log file. Defaults logging to
   hostname-slow.log. Must be enabled to activate other slow
   log options
@@ -2748,7 +2748,7 @@
   --socket=name       Socket file to use for connection
   --sort-buffer-size=# 
   Each thread that needs to do a sort allocates a buffer of
-@@ -817,7 +845,11 @@
+@@ -819,7 +847,11 @@
  log-short-format FALSE
  log-slave-updates FALSE
  log-slow-admin-statements FALSE
@@ -2760,7 +2760,7 @@
  log-tc tc.log
  log-tc-size 24576
  log-warnings 1
-@@ -933,6 +965,9 @@
+@@ -936,6 +968,9 @@
  slave-type-conversions 
  slow-launch-time 2
  slow-query-log FALSE

=== modified file 'patches/userstat.patch'
--- patches/userstat.patch	2011-12-13 13:49:04 +0000
+++ patches/userstat.patch	2011-12-29 02:23:24 +0000
@@ -363,7 +363,7 @@
  /*
    Log error with all enabled log event handlers
  
-@@ -5029,6 +5036,8 @@
+@@ -5026,6 +5033,8 @@
                               thd->first_successful_insert_id_in_prev_stmt_for_binlog);
            if (e.write(file))
              goto err;
@@ -372,7 +372,7 @@
          }
          if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0)
          {
-@@ -5040,12 +5049,16 @@
+@@ -5037,12 +5046,16 @@
                               minimum());
            if (e.write(file))
              goto err;
@@ -389,7 +389,7 @@
          }
          if (thd->user_var_events.elements)
          {
-@@ -5068,6 +5081,8 @@
+@@ -5065,6 +5078,8 @@
                                   flags);
              if (e.write(file))
                goto err;
@@ -398,7 +398,7 @@
            }
          }
        }
-@@ -5079,6 +5094,8 @@
+@@ -5076,6 +5091,8 @@
      if (event_info->write(file) ||
          DBUG_EVALUATE_IF("injecting_fault_writing", 1, 0))
        goto err;
@@ -407,7 +407,7 @@
  
      error= 0;
  err:
-@@ -5264,7 +5281,8 @@
+@@ -5310,7 +5327,8 @@
      be reset as a READ_CACHE to be able to read the contents from it.
   */
  
@@ -417,7 +417,7 @@
  {
    Mutex_sentry sentry(lock_log ? &LOCK_log : NULL);
  
-@@ -5311,6 +5329,7 @@
+@@ -5357,6 +5375,7 @@
        /* write the first half of the split header */
        if (my_b_write(&log_file, header, carry))
          return ER_ERROR_ON_WRITE;
@@ -425,7 +425,7 @@
  
        /*
          copy fixed second half of header to cache so the correct
-@@ -5379,6 +5398,7 @@
+@@ -5425,6 +5444,7 @@
      /* Write data to the binary log file */
      if (my_b_write(&log_file, cache->read_pos, length))
        return ER_ERROR_ON_WRITE;
@@ -433,7 +433,7 @@
      cache->read_pos=cache->read_end;		// Mark buffer used up
    } while ((length= my_b_fill(cache)));
  
-@@ -5493,20 +5513,23 @@
+@@ -5548,20 +5568,23 @@
        Query_log_event qinfo(thd, STRING_WITH_LEN("BEGIN"), TRUE, FALSE, TRUE, 0);
        if (qinfo.write(&log_file))
          goto err;
@@ -471,7 +471,7 @@
    void set_write_error(THD *thd, bool is_transactional);
    bool check_write_error(THD *thd);
  
-@@ -589,6 +590,7 @@
+@@ -591,6 +592,7 @@
                             const char *sql_text, uint sql_text_len,
                             CHARSET_INFO *client_cs);
    void flush();
@@ -726,7 +726,7 @@
    if (delete_table)
 --- a/sql/sql_class.cc
 +++ b/sql/sql_class.cc
-@@ -885,6 +885,13 @@
+@@ -978,6 +978,13 @@
    mysys_var=0;
    binlog_evt_union.do_union= FALSE;
    enable_slow_log= 0;
@@ -740,7 +740,7 @@
  #ifndef DBUG_OFF
    dbug_sentry=THD_SENTRY_MAGIC;
  #endif
-@@ -1264,6 +1271,7 @@
+@@ -1357,6 +1364,7 @@
      variables.option_bits|= OPTION_BIN_LOG;
    else
      variables.option_bits&= ~OPTION_BIN_LOG;
@@ -748,7 +748,7 @@
  
  #if defined(ENABLED_DEBUG_SYNC)
    /* Initialize the Debug Sync Facility. See debug_sync.cc. */
-@@ -1273,6 +1281,94 @@
+@@ -1366,6 +1374,94 @@
    clear_slow_extended();
  }
  
@@ -843,7 +843,7 @@
  
  /*
    Init THD for query processing.
-@@ -2027,6 +2123,32 @@
+@@ -2120,6 +2216,32 @@
  }
  #endif
  
@@ -876,7 +876,7 @@
  
  struct Item_change_record: public ilink
  {
-@@ -2203,6 +2325,7 @@
+@@ -2296,6 +2418,7 @@
    }
  
    thd->sent_row_count++;
@@ -884,7 +884,7 @@
  
    if (thd->vio_ok())
      DBUG_RETURN(protocol->write());
-@@ -2295,6 +2418,7 @@
+@@ -2388,6 +2511,7 @@
  select_export::~select_export()
  {
    thd->sent_row_count=row_count;
@@ -892,7 +892,7 @@
  }
  
  
-@@ -3318,6 +3442,7 @@
+@@ -3411,6 +3535,7 @@
    if (likely(thd != 0))
    { /* current_thd==0 when close_connection() calls net_send_error() */
      thd->status_var.bytes_sent+= length;
@@ -900,7 +900,7 @@
    }
  }
  
-@@ -3325,6 +3450,7 @@
+@@ -3418,6 +3543,7 @@
  void thd_increment_bytes_received(ulong length)
  {
    current_thd->status_var.bytes_received+= length;
@@ -910,7 +910,7 @@
  
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -1644,6 +1644,8 @@
+@@ -1705,6 +1705,8 @@
    */
    enum enum_server_command command;
    uint32     server_id;
@@ -919,7 +919,7 @@
    uint32     file_id;			// for LOAD DATA INFILE
    /* remote (peer) port */
    uint16 peer_port;
-@@ -2153,6 +2155,8 @@
+@@ -2214,6 +2216,8 @@
    */
    enum_tx_isolation tx_isolation;
    enum_check_fields count_cuted_fields;
@@ -928,7 +928,7 @@
  
    DYNAMIC_ARRAY user_var_events;        /* For user variables replication */
    MEM_ROOT      *user_var_events_alloc; /* Allocate above array elements here */
-@@ -2247,6 +2251,49 @@
+@@ -2308,6 +2312,49 @@
    */
    LOG_INFO*  current_linfo;
    NET*       slave_net;			// network connection from slave -> m.
@@ -978,7 +978,7 @@
    /* Used by the sys_var class to store temporary values */
    union
    {
-@@ -2327,6 +2374,11 @@
+@@ -2388,6 +2435,11 @@
      alloc_root. 
    */
    void init_for_queries();
@@ -990,7 +990,7 @@
    void change_user(void);
    void cleanup(void);
    void cleanup_after_query();
-@@ -2799,6 +2851,15 @@
+@@ -2860,6 +2912,15 @@
    }
    thd_scheduler scheduler;
  
@@ -1006,7 +1006,7 @@
  public:
    inline Internal_error_handler *get_internal_handler()
    { return m_internal_handler; }
-@@ -2999,6 +3060,10 @@
+@@ -3060,6 +3121,10 @@
    LEX_STRING invoker_host;
  };
  
@@ -1710,7 +1710,7 @@
  
 --- a/sql/sql_insert.cc
 +++ b/sql/sql_insert.cc
-@@ -1070,13 +1070,14 @@
+@@ -1072,13 +1072,14 @@
  
    if (error)
      goto abort;
@@ -1728,7 +1728,7 @@
    }
    else
    {
-@@ -1092,8 +1093,10 @@
+@@ -1094,8 +1095,10 @@
        sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
  	      (ulong) (info.deleted + updated),
                (ulong) thd->warning_info->statement_warn_count());
@@ -1740,7 +1740,7 @@
    thd->abort_on_warning= 0;
    DBUG_RETURN(FALSE);
  
-@@ -3535,6 +3538,7 @@
+@@ -3540,6 +3543,7 @@
       thd->first_successful_insert_id_in_prev_stmt :
       (info.copied ? autoinc_value_of_last_inserted_row : 0));
    ::my_ok(thd, row_count, id, buff);
@@ -3219,7 +3219,7 @@
  #define REG_NEW_RECORD		2	/* Write a new record if not found */
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -1632,6 +1632,17 @@
+@@ -1638,6 +1638,17 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG,
         ON_CHECK(check_read_only), ON_UPDATE(fix_read_only));
  
@@ -3461,7 +3461,7 @@
 \ No newline at end of file
 --- a/mysql-test/r/mysqld--help-notwin.result
 +++ b/mysql-test/r/mysqld--help-notwin.result
-@@ -743,6 +743,8 @@
+@@ -745,6 +745,8 @@
   Define threads usage for handling queries, one of
   one-thread-per-connection, no-threads, loaded-dynamically
   --thread-stack=#    The stack size for each thread
@@ -3470,7 +3470,7 @@
   --time-format=name  The TIME format (ignored)
   --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
   currently supported)
-@@ -768,6 +770,9 @@
+@@ -770,6 +772,9 @@
   of the underlying table and the query uses a LIMIT clause
   (usually get from GUI tools)
   -u, --user=name     Run mysqld daemon as user.
@@ -3480,7 +3480,7 @@
   -v, --verbose       Used with --help option for detailed help.
   -V, --version       Output version information and exit.
   --wait-timeout=#    The number of seconds the server waits for activity on a
-@@ -1002,6 +1007,7 @@
+@@ -1005,6 +1010,7 @@
  thread-cache-size 0
  thread-handling one-thread-per-connection
  thread-stack 262144
@@ -3488,7 +3488,7 @@
  time-format %H:%i:%s
  timed-mutexes FALSE
  tmp-table-size 16777216
-@@ -1009,6 +1015,7 @@
+@@ -1012,6 +1018,7 @@
  transaction-isolation REPEATABLE-READ
  transaction-prealloc-size 4096
  updatable-views-with-limit YES