#At file:///home/satya/WORK/mysql/mysql-5.1-bugteam/ based on revid:joro@stripped
3018 Satya B 2009-07-10
Applying InnoDB snashot 5.1-ss5488, part 1
1. Fixes build warnings caused by applying snapshot 5.1-ss5282
2. Fix the Makefile.am in storage/innobase to remove the header file
'fsp0types.h' which was added twice to fix build warning generated
after applying the 5.1-ss5282 snapshot
Detailed revision comments:
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
modified:
storage/innobase/Makefile.am
storage/innobase/include/trx0sys.ic
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0undo.c
=== modified file 'storage/innobase/Makefile.am'
--- a/storage/innobase/Makefile.am 2009-07-01 05:37:02 +0000
+++ b/storage/innobase/Makefile.am 2009-07-10 10:25:08 +0000
@@ -57,7 +57,7 @@ noinst_HEADERS= include/btr0btr.h inclu
include/ha0ha.ic include/hash0hash.h \
include/hash0hash.ic include/ibuf0ibuf.h \
include/ibuf0ibuf.ic include/ibuf0types.h \
- include/lock0iter.h include/fsp0types.h \
+ include/lock0iter.h \
include/lock0lock.h include/lock0lock.ic \
include/lock0priv.h include/lock0priv.ic \
include/lock0types.h include/log0log.h \
=== modified file 'storage/innobase/include/trx0sys.ic'
--- a/storage/innobase/include/trx0sys.ic 2007-03-22 21:59:35 +0000
+++ b/storage/innobase/include/trx0sys.ic 2009-07-10 10:25:08 +0000
@@ -9,6 +9,7 @@ Created 3/26/1996 Heikki Tuuri
#include "srv0srv.h"
#include "trx0trx.h"
#include "data0type.h"
+#include "mtr0log.h"
/* The typedef for rseg slot in the file copy */
typedef byte trx_sysf_rseg_t;
=== modified file 'storage/innobase/trx/trx0purge.c'
--- a/storage/innobase/trx/trx0purge.c 2007-03-29 04:46:28 +0000
+++ b/storage/innobase/trx/trx0purge.c 2009-07-10 10:25:08 +0000
@@ -14,6 +14,7 @@ Created 3/26/1996 Heikki Tuuri
#include "fsp0fsp.h"
#include "mach0data.h"
+#include "mtr0log.h"
#include "trx0rseg.h"
#include "trx0trx.h"
#include "trx0roll.h"
=== modified file 'storage/innobase/trx/trx0sys.c'
--- a/storage/innobase/trx/trx0sys.c 2009-06-11 13:05:12 +0000
+++ b/storage/innobase/trx/trx0sys.c 2009-07-10 10:25:08 +0000
@@ -13,7 +13,7 @@ Created 3/26/1996 Heikki Tuuri
#endif
#include "fsp0fsp.h"
-#include "mtr0mtr.h"
+#include "mtr0log.h"
#include "trx0trx.h"
#include "trx0rseg.h"
#include "trx0undo.h"
=== modified file 'storage/innobase/trx/trx0undo.c'
--- a/storage/innobase/trx/trx0undo.c 2009-03-03 01:32:04 +0000
+++ b/storage/innobase/trx/trx0undo.c 2009-07-10 10:25:08 +0000
@@ -14,6 +14,7 @@ Created 3/26/1996 Heikki Tuuri
#include "fsp0fsp.h"
#include "mach0data.h"
+#include "mtr0log.h"
#include "trx0rseg.h"
#include "trx0trx.h"
#include "srv0srv.h"
