diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-06-09 14:21:26 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-06-09 14:21:26 +0200 |
| commit | 8be051d7031f8787920f48827e35535151486d98 (patch) | |
| tree | cfb0990130f8a0122e91fd847221d04716176f74 /libmysqld | |
| parent | a6b7f71329ceb7d0188572f494b5d1a1f0461fc5 (diff) | |
| download | mariadb-git-8be051d7031f8787920f48827e35535151486d98.tar.gz | |
XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/innodb/
.bzrignore:
XtraDB compiles innodb in storage/xtradb instead of storage/innobase
CMakeLists.txt:
Take InnoDB code from storage/xtradb/ instead of storage/innobase/
libmysqld/CMakeLists.txt:
Take InnoDB code from storage/xtradb/ instead of storage/innobase/
storage/innobase/plug.in.disabled:
Disable building old InnoDB from storage/innobase/ directory.
We will keep the files around to avoid getting merge conflicts for every MySQL upstream
change to InnoDB.
storage/xtradb/CMakeLists.txt:
Take InnoDB code from storage/xtradb/ instead of storage/innobase/
storage/xtradb/COPYING:
Remove not needed file from XtraDB.
storage/xtradb/Makefile.am:
Take InnoDB code from storage/xtradb/ instead of storage/innobase/
storage/xtradb/Makefile.in:
Remove not needed file from XtraDB.
storage/xtradb/handler/ha_innodb.cc:
Take InnoDB code from storage/xtradb/ instead of storage/innobase/
storage/xtradb/plug.in:
Take InnoDB code from storage/xtradb/ instead of storage/innobase/
storage/xtradb/row/row0ins.c:
Take InnoDB code from storage/xtradb/ instead of storage/innobase/
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index ee08721b27c..8c51ad71aa9 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -132,9 +132,9 @@ IF(WITH_FEDERATED_STORAGE_ENGINE) ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/innobase/CMakeLists.txt) + INCLUDE(${CMAKE_SOURCE_DIR}/storage/xtradb/CMakeLists.txt) FOREACH(rpath ${INNOBASE_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/innobase/${rpath}) + SET(LIB_SOURCES ${LIB_SOURCES} ../storage/xtradb/${rpath}) ENDFOREACH(rpath) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) |