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 | 192bf819eb2bb91e383327d3bde6f596c20a82db (patch) | |
| tree | dceddcd17cf1278b50f8838476df5644f764efe9 /acinclude.m4 | |
| parent | 984750e13ef4a559c5da05b5fbd6fa363d3650b2 (diff) | |
| parent | 522e83b64ab46d400ccb6aa8d7b749eefc28f4d5 (diff) | |
| download | mariadb-git-192bf819eb2bb91e383327d3bde6f596c20a82db.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 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d3a404e5fb0..1fc357ff7c6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1252,7 +1252,6 @@ dnl Some libs are listed several times, in order for gcc to sort out dnl circular references. innodb_libs="\ \$(top_builddir)/innobase/usr/libusr.a\ - \$(top_builddir)/innobase/odbc/libodbc.a\ \$(top_builddir)/innobase/srv/libsrv.a\ \$(top_builddir)/innobase/dict/libdict.a\ \$(top_builddir)/innobase/que/libque.a\ |