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 /.bzrignore | |
| 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 '.bzrignore')
| -rw-r--r-- | .bzrignore | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index eeab335d0be..aeccd0cd0c0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1442,6 +1442,21 @@ storage/innobase/ib_config.h storage/innobase/ib_config.h.in storage/innobase/mkinstalldirs storage/innobase/stamp-h1 +storage/xtradb/autom4te-2.53.cache/* +storage/xtradb/autom4te-2.53.cache/output.0 +storage/xtradb/autom4te-2.53.cache/requests +storage/xtradb/autom4te-2.53.cache/traces.0 +storage/xtradb/autom4te.cache/* +storage/xtradb/autom4te.cache/output.0 +storage/xtradb/autom4te.cache/requests +storage/xtradb/autom4te.cache/traces.0 +storage/xtradb/configure.lineno +storage/xtradb/conftest.s1 +storage/xtradb/conftest.subs +storage/xtradb/ib_config.h +storage/xtradb/ib_config.h.in +storage/xtradb/mkinstalldirs +storage/xtradb/stamp-h1 storage/maria/*.MAD storage/maria/*.MAI storage/maria/ma_rt_test |