diff options
author | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
commit | 5eab19d7a329af61c6c218bf192a85881b51088d (patch) | |
tree | 3528bf5516292baeb59d3009dd2e876e94eceb91 /Makefile.am | |
parent | 2276ca1aef779a003dead2ce80f50ab6a9ae91d9 (diff) | |
parent | 1d24597ff94a45e714151f3024a013e44a569169 (diff) | |
download | mariadb-git-5eab19d7a329af61c6c218bf192a85881b51088d.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
CMakeLists.txt:
Auto merged
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 28551d52da7..9e9520c29d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ - @readline_topdir@ sql-common \ + @readline_topdir@ sql-common scripts \ @thread_dirs@ pstack \ - @sql_union_dirs@ scripts @man_dirs@ tests \ + @sql_union_dirs@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ |