← 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_separate_doublewrite.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_separate_doublewrite.patch
8
8
diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
9
9
--- a/storage/innobase/buf/buf0buf.c    2010-12-03 17:49:11.574962867 +0900
10
10
+++ b/storage/innobase/buf/buf0buf.c    2010-12-04 15:35:58.624514033 +0900
11
 
@@ -4251,7 +4251,8 @@
 
11
@@ -4268,7 +4268,8 @@
12
12
                read_space_id = mach_read_from_4(
13
13
                        frame + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
14
14
 
303
303
                /* The node must be put back to the LRU list */
304
304
                UT_LIST_ADD_FIRST(LRU, system->LRU, node);
305
305
        }
306
 
@@ -5318,7 +5328,7 @@
 
306
@@ -5316,7 +5326,7 @@
307
307
                ut_a(fil_node->n_pending == 0);
308
308
                ut_a(fil_node->open);
309
309
                ut_a(fil_node->space->purpose == FIL_TABLESPACE);
348
348
 
349
349
 /* The highest file format being used in the database. The value can be
350
350
 set by user, however, it will be adjusted to the newer file format if
351
 
@@ -2445,6 +2446,8 @@
 
351
@@ -2458,6 +2459,8 @@
352
352
                goto error;
353
353
        }
354
354
 
357
357
        srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
358
358
 
359
359
        /* -------------- Log files ---------------------------*/
360
 
@@ -11621,6 +11624,11 @@
 
360
@@ -11634,6 +11637,11 @@
361
361
   "Path to individual files and their sizes.",
362
362
   NULL, NULL, NULL);
363
363
 
369
369
 static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
370
370
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
371
371
   "The AUTOINC lock modes supported by InnoDB:               "
372
 
@@ -11788,6 +11796,7 @@
 
372
@@ -11801,6 +11809,7 @@
373
373
   MYSQL_SYSVAR(commit_concurrency),
374
374
   MYSQL_SYSVAR(concurrency_tickets),
375
375
   MYSQL_SYSVAR(data_file_path),
531
531
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
532
532
--- a/storage/innobase/srv/srv0srv.c    2010-12-04 15:35:29.180483212 +0900
533
533
+++ b/storage/innobase/srv/srv0srv.c    2010-12-04 15:35:58.656550107 +0900
534
 
@@ -170,6 +170,8 @@
 
534
@@ -169,6 +169,8 @@
535
535
 /* size in database pages */
536
536
 UNIV_INTERN ulint*     srv_data_file_sizes = NULL;
537
537
 
543
543
diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
544
544
--- a/storage/innobase/srv/srv0start.c  2010-12-04 15:35:29.183481330 +0900
545
545
+++ b/storage/innobase/srv/srv0start.c  2010-12-04 15:35:58.661550545 +0900
546
 
@@ -715,6 +715,7 @@
 
546
@@ -714,6 +714,7 @@
547
547
 /*======================*/
548
548
        ibool*          create_new_db,  /*!< out: TRUE if new database should be
549
549
                                        created */
551
551
 #ifdef UNIV_LOG_ARCHIVE
552
552
        ulint*          min_arch_log_no,/*!< out: min of archived log
553
553
                                        numbers in data files */
554
 
@@ -747,6 +748,7 @@
 
554
@@ -746,6 +747,7 @@
555
555
        *sum_of_new_sizes = 0;
556
556
 
557
557
        *create_new_db = FALSE;
559
559
 
560
560
        srv_normalize_path_for_win(srv_data_home);
561
561
 
562
 
@@ -984,6 +986,142 @@
 
562
@@ -983,6 +985,142 @@
563
563
                                srv_data_file_is_raw_partition[i] != 0);
564
564
        }
565
565
 
702
702
        return(DB_SUCCESS);
703
703
 }
704
704
 
705
 
@@ -997,6 +1135,7 @@
 
705
@@ -996,6 +1134,7 @@
706
706
 /*====================================*/
707
707
 {
708
708
        ibool           create_new_db;
710
710
        ibool           log_file_created;
711
711
        ibool           log_created     = FALSE;
712
712
        ibool           log_opened      = FALSE;
713
 
@@ -1462,6 +1601,7 @@
 
713
@@ -1461,6 +1600,7 @@
714
714
        }
715
715
 
716
716
        err = open_or_create_data_files(&create_new_db,
718
718
 #ifdef UNIV_LOG_ARCHIVE
719
719
                                        &min_arch_log_no, &max_arch_log_no,
720
720
 #endif /* UNIV_LOG_ARCHIVE */
721
 
@@ -1629,6 +1769,14 @@
 
721
@@ -1628,6 +1768,14 @@
722
722
                after the double write buffer has been created. */
723
723
                trx_sys_create();
724
724
 
733
733
                dict_create();
734
734
 
735
735
                srv_startup_is_before_trx_rollback_phase = FALSE;
736
 
@@ -1662,6 +1810,13 @@
 
736
@@ -1661,6 +1809,13 @@
737
737
                recv_recovery_from_archive_finish();
738
738
 #endif /* UNIV_LOG_ARCHIVE */
739
739
        } else {
747
747
 
748
748
                /* Check if we support the max format that is stamped
749
749
                on the system tablespace. 
750
 
@@ -1748,6 +1903,17 @@
 
750
@@ -1747,6 +1902,17 @@
751
751
                we have finished the recovery process so that the
752
752
                image of TRX_SYS_PAGE_NO is not stale. */
753
753
                trx_sys_file_format_tag_init();