diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-15 20:35:17 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-15 20:35:17 +0200 |
| commit | ad32d8553e36dd30514f284f88f20066e7254d6f (patch) | |
| tree | 2c3932e36efa9dcdd5ae15307bb4bbe0065ea4ad /libmysqld | |
| parent | cccd302c91a0bfb82ed6b387016a12a23420fb6f (diff) | |
| parent | 32b3a9fed23342cc28b57170c69e5e6892b87d1a (diff) | |
| download | mariadb-git-ad32d8553e36dd30514f284f88f20066e7254d6f.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 09176097be0..dab99d7509e 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -167,10 +167,13 @@ link_sources: rm -f $$f; \ @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \ done; \ - for f in $(sqlstoragesources); do \ - rm -f $$f; \ - @LN_CP_F@ `find $(srcdir)/../sql -name $$f` $$f; \ - done; \ + if test -n "$(sqlstoragesources)" ; \ + then \ + for f in "$(sqlstoragesources)"; do \ + rm -f "$$f"; \ + @LN_CP_F@ `find $(srcdir)/../sql -name "$$f"` "$$f"; \ + done; \ + fi; \ rm -f client_settings.h; \ @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h |