summaryrefslogtreecommitdiff
path: root/storage/xtradb/Makefile.am
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2012-11-09 10:11:20 +0200
committerunknown <timour@askmonty.org>2012-11-09 10:11:20 +0200
commit3f590335363dec43e301fac174f9349233f5804c (patch)
tree4c3b3e4f9f71cf31cc18cf7d0ba48a3ef3b5c2d3 /storage/xtradb/Makefile.am
parent94cae65774194f8769b18e6943713d1fed5f89fa (diff)
parent8df490044cf6fd4a7bcb38cab509975b39b1216d (diff)
downloadmariadb-git-3f590335363dec43e301fac174f9349233f5804c.tar.gz
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
Diffstat (limited to 'storage/xtradb/Makefile.am')
-rw-r--r--storage/xtradb/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/xtradb/Makefile.am b/storage/xtradb/Makefile.am
index 02eeaa1e456..c90a76ba142 100644
--- a/storage/xtradb/Makefile.am
+++ b/storage/xtradb/Makefile.am
@@ -101,6 +101,7 @@ noinst_HEADERS= \
include/lock0types.h \
include/log0log.h \
include/log0log.ic \
+ include/log0online.h \
include/log0recv.h \
include/log0recv.ic \
include/mach0data.h \
@@ -226,7 +227,6 @@ noinst_HEADERS= \
include/ut0vec.h \
include/ut0vec.ic \
include/ut0wqueue.h \
- handler/innodb_patch_info.h \
mem/mem0dbg.c
noinst_LTLIBRARIES= @plugin_xtradb_static_target@
@@ -265,6 +265,7 @@ libxtradb_la_SOURCES= \
lock/lock0iter.c \
lock/lock0lock.c \
log/log0log.c \
+ log/log0online.c \
log/log0recv.c \
mach/mach0data.c \
mem/mem0mem.c \