diff options
| author | unknown <serg@janus.mylan> | 2006-08-10 19:44:57 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2006-08-10 19:44:57 +0200 |
| commit | 161f79aefa68e4934420f6c928daebc254d90b13 (patch) | |
| tree | b1ffd64d165a003da9720f3229298502a5bcf13a /include/Makefile.am | |
| parent | ee20f7f25c5f28c24934ee50c3c5879b9f9fdd8e (diff) | |
| parent | cd876fb11883f68f93027a70b5f3f99ad9234f27 (diff) | |
| download | mariadb-git-161f79aefa68e4934420f6c928daebc254d90b13.tar.gz | |
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-maria
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
include/Makefile.am:
merged
unittest/mysys/my_atomic-t.c:
merged
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index e81fa3a6520..dff53e25e22 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -23,7 +23,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ mysql_time.h mysql/plugin.h $(BUILT_SOURCES) -noinst_HEADERS = config-win.h config-netware.h \ +noinst_HEADERS = config-win.h config-netware.h lf.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 \ |