← Back to branch summary

~tsarev/percona-server/5.1.59-porting-bad

« back to all changes in this revision

Viewing changes to innodb_overwrite_relay_log_info.patch

  • Committer: kinoyasu
  • Date: 2011-07-07 13:02:19 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: kinoyasu@gauntlet4-20110707130219-bev0gkkvwkh47u4m
Yasufumi patches are ported to 5.1.58. Removing/changing the patch files against my intention is not allowed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_overwrite_relay_log_info.patch
243
243
        trx_commit_for_mysql(trx);
244
244
 }
245
245
 
246
 
@@ -10795,6 +10987,12 @@
 
246
@@ -10791,6 +10983,12 @@
247
247
   "don't use the datafile for normal mysqld or ibbackup! ####",
248
248
   NULL, NULL, FALSE);
249
249
 
256
256
 static MYSQL_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
257
257
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
258
258
   "Enable InnoDB doublewrite buffer (enabled by default). "
259
 
@@ -11220,6 +11418,7 @@
 
259
@@ -11216,6 +11414,7 @@
260
260
   MYSQL_SYSVAR(old_blocks_pct),
261
261
   MYSQL_SYSVAR(old_blocks_time),
262
262
   MYSQL_SYSVAR(open_files),
316
316
diff -ruN a/storage/innodb_plugin/include/trx0trx.h b/storage/innodb_plugin/include/trx0trx.h
317
317
--- a/storage/innodb_plugin/include/trx0trx.h   2010-04-06 23:07:13.000000000 +0900
318
318
+++ b/storage/innodb_plugin/include/trx0trx.h   2010-04-29 16:42:07.000000000 +0900
319
 
@@ -569,6 +569,21 @@
 
319
@@ -580,6 +580,21 @@
320
320
        ib_int64_t      mysql_log_offset;/* if MySQL binlog is used, this field
321
321
                                        contains the end offset of the binlog
322
322
                                        entry */
341
341
diff -ruN a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
342
342
--- a/storage/innodb_plugin/trx/trx0sys.c       2010-04-29 16:39:34.000000000 +0900
343
343
+++ b/storage/innodb_plugin/trx/trx0sys.c       2010-04-29 16:42:07.000000000 +0900
344
 
@@ -74,13 +74,16 @@
 
344
@@ -75,13 +75,16 @@
345
345
 file name and position here. */
346
346
 /* @{ */
347
347
 /** Master binlog file name */
359
359
 /** If this MySQL server uses binary logging, after InnoDB has been inited
360
360
 and if it has done a crash recovery, we store the binlog file name and position
361
361
 here. */
362
 
@@ -675,22 +678,25 @@
 
362
@@ -676,22 +679,25 @@
363
363
 void
364
364
 trx_sys_update_mysql_binlog_offset(
365
365
 /*===============================*/
391
391
 
392
392
        if (mach_read_from_4(sys_header + field
393
393
                             + TRX_SYS_MYSQL_LOG_MAGIC_N_FLD)
394
 
@@ -813,13 +819,26 @@
 
394
@@ -814,13 +820,26 @@
395
395
                                         + TRX_SYS_MYSQL_LOG_OFFSET_LOW),
396
396
                sys_header + TRX_SYS_MYSQL_MASTER_LOG_INFO
397
397
                + TRX_SYS_MYSQL_LOG_NAME);
419
419
 
420
420
        trx_sys_mysql_master_log_pos
421
421
                = (((ib_int64_t) mach_read_from_4(
422
 
@@ -828,6 +847,19 @@
 
422
@@ -829,6 +848,19 @@
423
423
                + ((ib_int64_t) mach_read_from_4(
424
424
                           sys_header + TRX_SYS_MYSQL_MASTER_LOG_INFO
425
425
                           + TRX_SYS_MYSQL_LOG_OFFSET_LOW));
442
442
diff -ruN a/storage/innodb_plugin/trx/trx0trx.c b/storage/innodb_plugin/trx/trx0trx.c
443
443
--- a/storage/innodb_plugin/trx/trx0trx.c       2010-04-06 23:07:14.000000000 +0900
444
444
+++ b/storage/innodb_plugin/trx/trx0trx.c       2010-04-29 16:42:07.000000000 +0900
445
 
@@ -129,6 +129,10 @@
 
445
@@ -132,6 +132,10 @@
446
446
 
447
447
        trx->mysql_log_file_name = NULL;
448
448
        trx->mysql_log_offset = 0;
453
453
 
454
454
        mutex_create(&trx->undo_mutex, SYNC_TRX_UNDO);
455
455
 
456
 
@@ -732,6 +736,7 @@
 
456
@@ -791,6 +795,7 @@
457
457
        trx_rseg_t*     rseg;
458
458
        trx_undo_t*     undo;
459
459
        mtr_t           mtr;
461
461
 
462
462
        ut_ad(mutex_own(&kernel_mutex));
463
463
 
464
 
@@ -789,13 +794,35 @@
 
464
@@ -848,13 +853,35 @@
465
465
 
466
466
                if (trx->mysql_log_file_name
467
467
                    && trx->mysql_log_file_name[0] != '\0') {