diff options
| author | unknown <guilhem@gbichot3.local> | 2006-12-20 00:00:46 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-12-20 00:00:46 +0100 |
| commit | 8b998d1199d53baf002f6ad725fa69e4b2f6813b (patch) | |
| tree | 335d7c85728da44b45a4541bf523c09f0ab36f13 /include/Makefile.am | |
| parent | 8a2b3baaa9da6b94f0f609c1959ad00929ec7621 (diff) | |
| parent | c2f2a41ed32522fa89f5c79fec42ab60e0b4aa62 (diff) | |
| download | mariadb-git-8b998d1199d53baf002f6ad725fa69e4b2f6813b.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean
into gbichot3.local:/home/mysql_src/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
configure.in:
Auto merged
BitKeeper/triggers/post-commit:
merge
include/Makefile.am:
merge
include/my_global.h:
merge
include/my_sys.h:
merge
libmysql/Makefile.shared:
merge
libmysqld/Makefile.am:
merge
mysql-test/mysql-test-run.pl:
merge
mysys/Makefile.am:
merge
mysys/mf_keycache.c:
merge
mysys/mf_keycaches.c:
merge
mysys/my_handler.c:
merge
mysys/my_init.c:
merge
mysys/my_open.c:
merge
mysys/my_pread.c:
merge
sql/Makefile.am:
merge
sql/handler.h:
merge
sql/item_func.cc:
merge
sql/item_func.h:
merge
sql/log.cc:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
merge
sql/set_var.cc:
merge
sql/sql_class.h:
merge
sql/sql_parse.cc:
merge
sql/sql_select.cc:
merge
sql/sql_test.cc:
merge
sql/unireg.cc:
merge
storage/csv/ha_tina.cc:
merge
storage/myisam/ft_boolean_search.c:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisam/ha_myisam.h:
merge
storage/myisam/mi_create.c:
merge
storage/myisam/mi_delete.c:
merge
storage/myisam/mi_dynrec.c:
merge
storage/myisam/mi_key.c:
merge
storage/myisam/mi_open.c:
merge
storage/myisam/mi_test2.c:
merge
storage/myisam/mi_unique.c:
merge
storage/myisam/mi_write.c:
merge
storage/myisam/myisamchk.c:
merge
storage/myisam/myisampack.c:
merge
storage/myisam/sort.c:
merge
unittest/mytap/tap.c:
merge
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 8651a2dd9b1..f5f35c941f5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -27,8 +27,8 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ my_getopt.h sslopt-longopts.h my_dir.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ m_ctype.h mysql/plugin.h $(HEADERS_GEN) -noinst_HEADERS = config-win.h config-netware.h \ - heap.h my_bitmap.h my_uctype.h \ +noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \ + heap.h maria.h myisamchk.h my_bitmap.h my_uctype.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ mysys_err.h my_base.h help_start.h help_end.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ @@ -37,7 +37,7 @@ noinst_HEADERS = config-win.h config-netware.h \ mysql_version.h.in my_handler.h my_time.h decimal.h \ my_vle.h my_user.h my_atomic.h atomic/nolock.h \ atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \ - my_libwrap.h + my_libwrap.h pagecache.h # Remove built files and the symlinked directories CLEANFILES = $(BUILT_SOURCES) readline openssl |