← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/buf/buf0buf.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/buf/buf0buf.cc
52
52
#include "log0recv.h"
53
53
#include "page0zip.h"
54
54
 
55
 
#include <drizzled/errmsg_print.h>
56
 
 
57
55
/*
58
56
                IMPLEMENTATION OF THE BUFFER POOL
59
57
                =================================
322
320
 
323
321
        /* When we traverse all the flush lists we don't want another
324
322
        thread to add a dirty page to any flush list. */
325
 
        if (srv_buf_pool_instances > 1)
326
 
                log_flush_order_mutex_enter();
 
323
        log_flush_order_mutex_enter();
327
324
 
328
325
        for (i = 0; i < srv_buf_pool_instances; i++) {
329
326
                buf_pool_t*     buf_pool;
530
527
                     < mach_read_from_8(read_buf + FIL_PAGE_LSN))) {
531
528
                        ut_print_timestamp(stderr);
532
529
 
533
 
                        drizzled::errmsg_printf(drizzled::error::INFO,
534
 
                                                "InnoDB: Error: page %lu log sequence number %"PRIu64". "
535
 
                                                "InnoDB: is in the future! Current system log sequence number %"PRIu64". "
536
 
                                                "Your database may be corrupt or you may have copied the InnoDB tablespace but not the InnoDB log files. See "
537
 
                                                " " REFMAN "forcing-recovery.html for more information. ",
538
 
                                                (ulong) mach_read_from_4(read_buf
539
 
                                                                         + FIL_PAGE_OFFSET),
540
 
                                                mach_read_from_8(read_buf + FIL_PAGE_LSN),
541
 
                                                current_lsn);
 
530
                        fprintf(stderr,
 
531
                                "  InnoDB: Error: page %lu log sequence number"
 
532
                                " %"PRIu64"\n"
 
533
                                "InnoDB: is in the future! Current system "
 
534
                                "log sequence number %"PRIu64".\n"
 
535
                                "InnoDB: Your database may be corrupt or "
 
536
                                "you may have copied the InnoDB\n"
 
537
                                "InnoDB: tablespace but not the InnoDB "
 
538
                                "log files. See\n"
 
539
                                "InnoDB: " REFMAN "forcing-recovery.html\n"
 
540
                                "InnoDB: for more information.\n",
 
541
                                (ulong) mach_read_from_4(read_buf
 
542
                                                         + FIL_PAGE_OFFSET),
 
543
                                mach_read_from_8(read_buf + FIL_PAGE_LSN),
 
544
                                current_lsn);
542
545
                }
543
546
        }
544
547
#endif
4054
4057
                        recv_recover_page(TRUE, (buf_block_t*) bpage);
4055
4058
                }
4056
4059
 
4057
 
                if (uncompressed && !recv_no_ibuf_operations && !srv_fake_write) {
 
4060
                if (uncompressed && !recv_no_ibuf_operations) {
4058
4061
                        ibuf_merge_or_delete_for_page(
4059
4062
                                (buf_block_t*) bpage, bpage->space,
4060
4063
                                bpage->offset, buf_page_get_zip_size(bpage),