← Back to branch summary

~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix

« back to all changes in this revision

Viewing changes to innodb_lru_dump_restore.patch

  • Committer: kinoyasu
  • Date: 2011-05-10 11:57:42 UTC
  • Revision ID: kinoyasu@gauntlet4-20110510115742-3i3194rn2m8fipm2
port Yasufumi patches to 5.5.12

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_lru_dump_restore.patch
8
8
diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
9
9
--- a/storage/innobase/buf/buf0lru.c    2010-12-03 15:49:59.185023424 +0900
10
10
+++ b/storage/innobase/buf/buf0lru.c    2010-12-04 15:33:37.626482350 +0900
11
 
@@ -2224,6 +2224,284 @@
 
11
@@ -2245,6 +2245,284 @@
12
12
        memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
13
13
 }
14
14
 
308
308
diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
309
309
--- a/storage/innobase/fil/fil0fil.c    2010-12-03 17:49:11.581025127 +0900
310
310
+++ b/storage/innobase/fil/fil0fil.c    2010-12-04 15:33:37.632482885 +0900
311
 
@@ -4967,6 +4967,70 @@
 
311
@@ -4965,6 +4965,70 @@
312
312
        return(DB_SUCCESS);
313
313
 }
314
314
 
382
382
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
383
383
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:49:11.589956135 +0900
384
384
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-04 15:33:37.645555490 +0900
385
 
@@ -11773,6 +11773,12 @@
 
385
@@ -11786,6 +11786,12 @@
386
386
   "Limit the allocated memory for dictionary cache. (0: unlimited)",
387
387
   NULL, NULL, 0, 0, LONG_MAX, 0);
388
388
 
395
395
 static struct st_mysql_sys_var* innobase_system_variables[]= {
396
396
   MYSQL_SYSVAR(additional_mem_pool_size),
397
397
   MYSQL_SYSVAR(autoextend_increment),
398
 
@@ -11854,6 +11860,7 @@
 
398
@@ -11867,6 +11873,7 @@
399
399
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
400
400
   MYSQL_SYSVAR(read_ahead_threshold),
401
401
   MYSQL_SYSVAR(io_capacity),
413
413
+#include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
414
414
 }
415
415
 
416
 
 static const char plugin_author[] = "Innobase Oy";
417
 
@@ -4272,6 +4273,36 @@
 
416
 #define OK(expr)               \
 
417
@@ -4270,6 +4271,36 @@
418
418
                        "Hello!");
419
419
                goto end_func;
420
420
        }
545
545
 /** Status variables to be passed to MySQL */
546
546
 typedef struct export_var_struct export_struc;
547
547
 
548
 
@@ -679,6 +682,16 @@
 
548
@@ -664,6 +667,16 @@
549
549
 /*=====================*/
550
550
        void*   arg);   /*!< in: a dummy parameter required by
551
551
                        os_thread_create */
565
565
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
566
566
--- a/storage/innobase/srv/srv0srv.c    2010-12-03 17:49:11.620986661 +0900
567
567
+++ b/storage/innobase/srv/srv0srv.c    2010-12-04 15:33:37.708550811 +0900
568
 
@@ -337,6 +337,9 @@
 
568
@@ -336,6 +336,9 @@
569
569
 reading of a disk page */
570
570
 UNIV_INTERN ulint srv_buf_pool_reads = 0;
571
571
 
575
575
 /* structure to pass status variables to MySQL */
576
576
 UNIV_INTERN export_struc export_vars;
577
577
 
578
 
@@ -2703,6 +2706,56 @@
 
578
@@ -2691,6 +2694,56 @@
579
579
        /* We count the number of threads in os_thread_exit(). A created
580
580
        thread should always use that to exit and not use return() to exit. */
581
581
 
635
635
diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
636
636
--- a/storage/innobase/srv/srv0start.c  2010-12-03 15:18:48.916955609 +0900
637
637
+++ b/storage/innobase/srv/srv0start.c  2010-12-04 15:33:37.711484798 +0900
638
 
@@ -121,9 +121,9 @@
 
638
@@ -120,9 +120,9 @@
639
639
 static os_file_t       files[1000];
640
640
 
641
641
 /** io_handler_thread parameters for thread identification */
647
647
 
648
648
 /** We use this mutex to test the return value of pthread_mutex_trylock
649
649
    on successful locking. HP-UX does NOT return 0, though Linux et al do. */
650
 
@@ -1822,6 +1822,10 @@
 
650
@@ -1821,6 +1821,10 @@
651
651
        os_thread_create(&srv_monitor_thread, NULL,
652
652
                         thread_ids + 4 + SRV_MAX_N_IO_THREADS);
653
653