diff options
| author | unknown <serg@serg.mylan> | 2006-05-28 17:02:50 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-05-28 17:02:50 +0200 |
| commit | f1bb09e777427145f614c52488ead02a62e062e2 (patch) | |
| tree | 6c103c1bc07584b158605a885c7101660271d97a /client/Makefile.am | |
| parent | f04b7da96fba46b73466efdc4f1d6aa3f3426988 (diff) | |
| download | mariadb-git-f1bb09e777427145f614c52488ead02a62e062e2.tar.gz | |
Incompatible ftparser plugin API change.
mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
not a mysql_ftparam.
client/Makefile.am:
don't fail when rm cannot delete from read-only dir
sql/sql_plugin.cc:
fix min_plugin_info_interface_version to be less error-prone
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index aa78f825c87..be2888367a6 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -83,13 +83,13 @@ link_sources: for f in $(sql_src) ; do \ rm -f $$f; \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ - done; \ - for f in $(strings_src) ; do \ - rm -f $(srcdir)/$$f; \ - @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ - done; \ - rm -f $(srcdir)/my_user.c; \ - @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c + done; + for f in $(strings_src) ; do \ + rm -f $(srcdir)/$$f; \ + @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ + done; + -rm -f $(srcdir)/my_user.c; + @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c # Don't update the files from bitkeeper |