← Back to branch summary

~longbow/percona-server/ps55_log_slow_rate_limit

« back to all changes in this revision

Viewing changes to innodb_pass_corrupt_table.patch

  • Committer: Stewart Smith
  • Date: 2011-06-24 04:56:14 UTC
  • mfrom: (131.2.1 5.5.13-tmp)
  • Revision ID: stewart@flamingspork.com-20110624045614-60ijn09a51kbsr6w
merge fix of valgrind errors in various federated test cases on 32bit valgrind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_pass_corrupt_table.patch
331
331
 
332
332
 /* prototypes for new functions added to ha_innodb.cc */
333
333
 trx_t* innobase_get_trx();
334
 
@@ -1131,6 +1132,11 @@
 
334
@@ -1135,6 +1136,11 @@
335
335
                        ready = buf_flush_ready_for_replace(&block->page);
336
336
                        mutex_exit(&block->mutex);
337
337
 
343
343
                        if (!ready) {
344
344
 
345
345
                                return(block);
346
 
@@ -2475,6 +2481,13 @@
 
346
@@ -2479,6 +2485,13 @@
347
347
                return(NULL);
348
348
        }
349
349
 
357
357
        block_mutex = buf_page_get_mutex_enter(bpage);
358
358
 
359
359
        rw_lock_s_unlock(&buf_pool->page_hash_latch);
360
 
@@ -3036,6 +3049,13 @@
 
360
@@ -3040,6 +3053,13 @@
361
361
                return(NULL);
362
362
        }
363
363
 
371
371
        switch (buf_block_get_state(block)) {
372
372
                buf_page_t*     bpage;
373
373
                ibool           success;
374
 
@@ -3710,6 +3730,7 @@
 
374
@@ -3714,6 +3734,7 @@
375
375
        bpage->newest_modification = 0;
376
376
        bpage->oldest_modification = 0;
377
377
        HASH_INVALIDATE(bpage, hash);
379
379
 #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
380
380
        bpage->file_page_was_freed = FALSE;
381
381
 #endif /* UNIV_DEBUG_FILE_ACCESSES || UNIV_DEBUG */
382
 
@@ -4299,6 +4320,7 @@
 
382
@@ -4303,6 +4324,7 @@
383
383
                                (ulong) bpage->offset);
384
384
                }
385
385
 
387
387
                /* From version 3.23.38 up we store the page checksum
388
388
                to the 4 first bytes of the page end lsn field */
389
389
 
390
 
@@ -4340,6 +4362,23 @@
 
390
@@ -4344,6 +4366,23 @@
391
391
                              REFMAN "forcing-innodb-recovery.html\n"
392
392
                              "InnoDB: about forcing recovery.\n", stderr);
393
393
 
411
411
                        if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) {
412
412
                                fputs("InnoDB: Ending processing because of"
413
413
                                      " a corrupt database page.\n",
414
 
@@ -4347,6 +4386,7 @@
 
414
@@ -4351,6 +4390,7 @@
415
415
                                exit(1);
416
416
                        }
417
417
                }
419
419
 
420
420
                if (recv_recovery_is_on()) {
421
421
                        /* Pages must be uncompressed for crash recovery. */
422
 
@@ -4356,8 +4396,11 @@
 
422
@@ -4360,8 +4400,11 @@
423
423
 
424
424
                if (uncompressed && !recv_no_ibuf_operations) {
425
425
                        ibuf_merge_or_delete_for_page(