← Back to branch summary

~stewart/percona-server/Percona-Server-5.1.54-12-bug814404

« back to all changes in this revision

Viewing changes to innodb_lru_dump_restore.patch

  • Committer: kinoyasu
  • Date: 2010-12-16 11:35:26 UTC
  • Revision ID: kinoyasu@gauntlet4-20101216113526-62t7dahi1aeajp29
Yasufumi patches are ported to 5.1.54

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_lru_dump_restore.patch
302
302
diff -ruN a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
303
303
--- a/storage/innodb_plugin/fil/fil0fil.c       2010-08-27 16:32:40.298411400 +0900
304
304
+++ b/storage/innodb_plugin/fil/fil0fil.c       2010-08-27 16:34:33.868058362 +0900
305
 
@@ -4869,6 +4869,78 @@
 
305
@@ -4915,6 +4915,78 @@
306
306
        return(DB_SUCCESS);
307
307
 }
308
308
 
384
384
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
385
385
--- a/storage/innodb_plugin/handler/ha_innodb.cc        2010-10-01 09:57:56.486228425 +0900
386
386
+++ b/storage/innodb_plugin/handler/ha_innodb.cc        2010-10-01 10:00:13.292228546 +0900
387
 
@@ -11481,6 +11481,12 @@
 
387
@@ -11473,6 +11473,12 @@
388
388
   "Limit the allocated memory for dictionary cache. (0: unlimited)",
389
389
   NULL, NULL, 0, 0, LONG_MAX, 0);
390
390
 
397
397
 static struct st_mysql_sys_var* innobase_system_variables[]= {
398
398
   MYSQL_SYSVAR(additional_mem_pool_size),
399
399
   MYSQL_SYSVAR(autoextend_increment),
400
 
@@ -11563,6 +11569,7 @@
 
400
@@ -11555,6 +11561,7 @@
401
401
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
402
402
   MYSQL_SYSVAR(read_ahead_threshold),
403
403
   MYSQL_SYSVAR(io_capacity),
667
667
 
668
668
 /** We use this mutex to test the return value of pthread_mutex_trylock
669
669
    on successful locking. HP-UX does NOT return 0, though Linux et al do. */
670
 
@@ -1680,6 +1680,10 @@
 
670
@@ -1700,6 +1700,10 @@
671
671
        os_thread_create(&srv_monitor_thread, NULL,
672
672
                         thread_ids + 4 + SRV_MAX_N_IO_THREADS);
673
673
 
678
678
        srv_is_being_started = FALSE;
679
679
 
680
680
        if (trx_doublewrite == NULL) {
681
 
@@ -1704,13 +1708,13 @@
 
681
@@ -1724,13 +1728,13 @@
682
682
                ulint i;
683
683
 
684
684
                os_thread_create(&srv_purge_thread, NULL, thread_ids