← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

Viewing changes to storage/innobase/trx/trx0sys.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 22:33:55 UTC
  • mto: (1.2.1) (37.1.1 lucid-security)
  • mto: This revision was merged to the branch mainline in revision 36.
  • Revision ID: package-import@ubuntu.com-20120222223355-ku1tb4r70osci6v2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/trx/trx0sys.c
165
165
{
166
166
        page_t* page;
167
167
        page_t* page2;
 
168
#ifdef UNIV_SYNC_DEBUG
168
169
        page_t* new_page;
 
170
#endif /* UNIV_SYNC_DEBUG */
169
171
        byte*   doublewrite;
170
172
        byte*   fseg_header;
171
173
        ulint   page_no;
271
273
                        the page position in the tablespace, then the page
272
274
                        has not been written to in doublewrite. */
273
275
 
274
 
                        new_page = buf_page_get(TRX_SYS_SPACE, page_no,
275
 
                                                RW_X_LATCH, &mtr);
 
276
#ifdef UNIV_SYNC_DEBUG
 
277
                        new_page =
 
278
#endif /* UNIV_SYNC_DEBUG */
 
279
                        buf_page_get(TRX_SYS_SPACE, page_no,
 
280
                                     RW_X_LATCH, &mtr);
276
281
#ifdef UNIV_SYNC_DEBUG
277
282
                        buf_page_dbg_add_level(new_page, SYNC_NO_ORDER_CHECK);
278
283
#endif /* UNIV_SYNC_DEBUG */
507
512
                                                " recover the database"
508
513
                                                " with the my.cnf\n"
509
514
                                                "InnoDB: option:\n"
510
 
                                                "InnoDB: set-variable="
511
 
                                                "innodb_force_recovery=6\n");
 
515
                                                "InnoDB:"
 
516
                                                " innodb_force_recovery=6\n");
512
517
                                        exit(1);
513
518
                                }
514
519