← Back to branch summary

~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to innodb_separate_doublewrite.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_separate_doublewrite.patch
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
 
@@ -2426,6 +2427,8 @@
 
351
@@ -2445,6 +2446,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
 
@@ -11556,6 +11559,11 @@
 
360
@@ -11610,6 +11613,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
 
@@ -11721,6 +11729,7 @@
 
372
@@ -11782,6 +11790,7 @@
373
373
   MYSQL_SYSVAR(commit_concurrency),
374
374
   MYSQL_SYSVAR(concurrency_tickets),
375
375
   MYSQL_SYSVAR(data_file_path),
519
519
diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
520
520
--- a/storage/innobase/row/row0mysql.c  2010-12-03 17:30:16.334989510 +0900
521
521
+++ b/storage/innobase/row/row0mysql.c  2010-12-04 15:35:58.652496484 +0900
522
 
@@ -3421,7 +3421,7 @@
 
522
@@ -3423,7 +3423,7 @@
523
523
                /* Do not drop possible .ibd tablespace if something went
524
524
                wrong: we do not want to delete valuable data of the user */
525
525
 
710
710
        ibool           log_file_created;
711
711
        ibool           log_created     = FALSE;
712
712
        ibool           log_opened      = FALSE;
713
 
@@ -1453,6 +1592,7 @@
 
713
@@ -1456,6 +1595,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
 
@@ -1620,6 +1760,14 @@
 
721
@@ -1623,6 +1763,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
 
@@ -1653,6 +1801,13 @@
 
736
@@ -1656,6 +1804,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
 
@@ -1739,6 +1894,17 @@
 
750
@@ -1742,6 +1897,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();