diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 14:18:55 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 14:18:55 +0200 |
| commit | 6bfa5a40bc8619d535ac656c36d4ebc5fd18093b (patch) | |
| tree | 0f985ddfffc9a795634474887ee05e3d46ec88c9 /Makefile.am | |
| parent | 8a4f717dfe87219281be020cc8d5f11f16d9e8f4 (diff) | |
| parent | 5eab19d7a329af61c6c218bf192a85881b51088d (diff) | |
| download | mariadb-git-6bfa5a40bc8619d535ac656c36d4ebc5fd18093b.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
scripts/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
client/mysql_upgrade.c:
Use remote
mysql-test/r/mysql_upgrade.result:
Use remote
Makefile.am:
Merge "build scripts/ a little earlier"
include/my_global.h:
Merge
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 ee5882e512a..24f646cc8e4 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@ \ |