diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 17:00:43 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 17:00:43 +0200 |
| commit | 406233b6f4cdc8fd6b62b54a66a131391cb55b66 (patch) | |
| tree | ceba48b8ceba1bef7ebd9ad813a0734488dd4c2c /Makefile.am | |
| parent | 4e6e8a399dfb583448ffa4fc6342973b03c4d83b (diff) | |
| parent | 5a144fcd378ae4cd05d18e4e9fef780fe925a881 (diff) | |
| download | mariadb-git-406233b6f4cdc8fd6b62b54a66a131391cb55b66.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
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 e62cb7179bf..b0ad19e9148 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@ \ - @readline_topdir@ sql-common \ + @readline_topdir@ sql-common scripts \ @thread_dirs@ pstack \ - @sql_union_dirs@ unittest storage plugin \ + @sql_union_dirs@ scripts unittest storage plugin \ @sql_server@ scripts @man_dirs@ tests \ netware @libmysqld_dirs@ \ mysql-test support-files sql-bench @tools_dirs@ \ |