← Back to branch summary

~percona-dev/percona-server/release-5.1.59-13.0

« back to all changes in this revision

Viewing changes to patches/innodb_lru_dump_restore.patch

  • Committer: Stewart Smith
  • Date: 2011-10-09 00:48:54 UTC
  • mfrom: (321.7.2 5.1.59-porting)
  • Revision ID: stewart@flamingspork.com-20111009004854-btecbnpy3ehis27p
merge 5.1.59

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb_lru_dump_restore.patch
41
41
+--file_exists $MYSQLD_DATADIR/ib_lru_dump;
42
42
--- a/storage/innodb_plugin/buf/buf0lru.c
43
43
+++ b/storage/innodb_plugin/buf/buf0lru.c
44
 
@@ -2121,6 +2121,282 @@
 
44
@@ -2042,6 +2042,282 @@
45
45
        memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur);
46
46
 }
47
47
 
326
326
 Validates the LRU list.
327
327
--- a/storage/innodb_plugin/buf/buf0rea.c
328
328
+++ b/storage/innodb_plugin/buf/buf0rea.c
329
 
@@ -56,7 +56,7 @@
 
329
@@ -64,7 +64,7 @@
330
330
 which case it is never read into the pool, or if the tablespace does
331
331
 not exist or is being dropped 
332
332
 @return 1 if read request is issued. 0 if it is not */
419
419
 /** Possible values for system variable "innodb_stats_method". The values
420
420
 are defined the same as its corresponding MyISAM system variable
421
421
 "myisam_stats_method"(see "myisam_stats_method_names"), for better usability */
422
 
@@ -2408,6 +2410,8 @@
 
422
@@ -2410,6 +2412,8 @@
423
423
        srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
424
424
        srv_use_checksums = (ibool) innobase_use_checksums;
425
425
 
428
428
 #ifdef HAVE_LARGE_PAGES
429
429
         if ((os_use_large_pages = (ibool) my_use_large_pages))
430
430
                os_large_page_size = (ulint) opt_large_page_size;
431
 
@@ -11478,6 +11482,18 @@
 
431
@@ -11473,6 +11477,18 @@
432
432
   "Limit the allocated memory for dictionary cache. (0: unlimited)",
433
433
   NULL, NULL, 0, 0, LONG_MAX, 0);
434
434
 
447
447
 static struct st_mysql_sys_var* innobase_system_variables[]= {
448
448
   MYSQL_SYSVAR(additional_mem_pool_size),
449
449
   MYSQL_SYSVAR(autoextend_increment),
450
 
@@ -11557,6 +11573,8 @@
451
 
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
 
450
@@ -11553,6 +11569,8 @@
 
451
   MYSQL_SYSVAR(random_read_ahead),
452
452
   MYSQL_SYSVAR(read_ahead_threshold),
453
453
   MYSQL_SYSVAR(io_capacity),
454
454
+  MYSQL_SYSVAR(auto_lru_dump),
514
514
 };
515
515
--- a/storage/innodb_plugin/include/buf0lru.h
516
516
+++ b/storage/innodb_plugin/include/buf0lru.h
517
 
@@ -209,6 +209,18 @@
 
517
@@ -198,6 +198,18 @@
518
518
 void
519
519
 buf_LRU_stat_update(void);
520
520
 /*=====================*/
592
592
 handler for completed requests. The aio array of pending requests is divided
593
593
--- a/storage/innodb_plugin/include/srv0srv.h
594
594
+++ b/storage/innodb_plugin/include/srv0srv.h
595
 
@@ -332,6 +332,12 @@
 
595
@@ -333,6 +333,12 @@
596
596
 reading of a disk page */
597
597
 extern ulint srv_buf_pool_reads;
598
598
 
605
605
 /** Status variables to be passed to MySQL */
606
606
 typedef struct export_var_struct export_struc;
607
607
 
608
 
@@ -613,6 +619,16 @@
 
608
@@ -614,6 +620,16 @@
609
609
 /*=====================*/
610
610
        void*   arg);   /*!< in: a dummy parameter required by
611
611
                        os_thread_create */
624
624
 @return FALSE if not all information printed
625
625
--- a/storage/innodb_plugin/srv/srv0srv.c
626
626
+++ b/storage/innodb_plugin/srv/srv0srv.c
627
 
@@ -303,6 +303,12 @@
 
627
@@ -305,6 +305,12 @@
628
628
 reading of a disk page */
629
629
 UNIV_INTERN ulint srv_buf_pool_reads = 0;
630
630
 
637
637
 /* structure to pass status variables to MySQL */
638
638
 UNIV_INTERN export_struc export_vars;
639
639
 
640
 
@@ -2552,6 +2558,58 @@
 
640
@@ -2556,6 +2562,58 @@
641
641
        OS_THREAD_DUMMY_RETURN;
642
642
 }
643
643