diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-22 09:50:59 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-22 09:50:59 +0200 |
| commit | bdaf5c2baa1fda7b89ec65fac2da578197a12a85 (patch) | |
| tree | dceddcd17cf1278b50f8838476df5644f764efe9 /innobase/Makefile.am | |
| parent | 416dc3b4ddda3087051b3901191bbc92a4184205 (diff) | |
| parent | 1052b6122da96aef27b4d102207ec45d976ae9f0 (diff) | |
| download | mariadb-git-bdaf5c2baa1fda7b89ec65fac2da578197a12a85.tar.gz | |
merge with 4.0
BitKeeper/etc/ignore:
auto-union
VC++Files/comp_err/comp_err.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
acinclude.m4:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/com/com0shm.c:
Auto merged
innobase/data/data0data.c:
Auto merged
innobase/ha/ha0ha.c:
Auto merged
innobase/include/buf0buf.ic:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/include/ibuf0ibuf.h:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/mtr0log.h:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/include/os0proc.h:
Auto merged
innobase/include/os0thread.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0sync.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/mtr/mtr0mtr.c:
Auto merged
innobase/os/os0proc.c:
Auto merged
innobase/page/page0page.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0rec.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'innobase/Makefile.am')
| -rw-r--r-- | innobase/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/Makefile.am b/innobase/Makefile.am index cc4ce312d8d..17d7130f3e0 100644 --- a/innobase/Makefile.am +++ b/innobase/Makefile.am @@ -23,7 +23,7 @@ TAR = gtar noinst_HEADERS = ib_config.h SUBDIRS = os ut btr buf com data dict dyn eval fil fsp fut \ - ha ibuf include lock log mach mem mtr odbc page \ + ha ibuf include lock log mach mem mtr page \ pars que read rem row srv sync thr trx usr # Don't update the files from bitkeeper |