Commit a1532f0d authored by vasil's avatar vasil

branches/5.1:

Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages

Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
parent cf1b7085
...@@ -13,15 +13,12 @@ Created 3/26/1996 Heikki Tuuri ...@@ -13,15 +13,12 @@ Created 3/26/1996 Heikki Tuuri
#include "trx0types.h" #include "trx0types.h"
#include "mtr0mtr.h" #include "mtr0mtr.h"
#include "mtr0log.h"
#include "ut0byte.h" #include "ut0byte.h"
#include "mem0mem.h" #include "mem0mem.h"
#include "sync0sync.h" #include "sync0sync.h"
#include "ut0lst.h" #include "ut0lst.h"
#include "buf0buf.h" #include "buf0buf.h"
#include "fil0fil.h" #include "fil0fil.h"
#include "fut0lst.h"
#include "fsp0fsp.h"
#include "read0types.h" #include "read0types.h"
/* In a MySQL replication slave, in crash recovery we store the master log /* In a MySQL replication slave, in crash recovery we store the master log
...@@ -302,6 +299,7 @@ trx_sys_print_mysql_master_log_pos(void); ...@@ -302,6 +299,7 @@ trx_sys_print_mysql_master_log_pos(void);
/* Space id and page no where the trx system file copy resides */ /* Space id and page no where the trx system file copy resides */
#define TRX_SYS_SPACE 0 /* the SYSTEM tablespace */ #define TRX_SYS_SPACE 0 /* the SYSTEM tablespace */
#include "fsp0fsp.h"
#define TRX_SYS_PAGE_NO FSP_TRX_SYS_PAGE_NO #define TRX_SYS_PAGE_NO FSP_TRX_SYS_PAGE_NO
/* The offset of the transaction system header on the page */ /* The offset of the transaction system header on the page */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment