diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-24 00:09:54 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-24 00:09:54 +0200 |
| commit | b16c389248d03f0c3de549884f607f3f191827b4 (patch) | |
| tree | 6068b9d90b4127b1c3608e29913fa82bf1a1f20e /extra | |
| parent | 01b100b5dd3040daa18791abb88a9ffef06efe67 (diff) | |
| parent | b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083 (diff) | |
| download | mariadb-git-b16c389248d03f0c3de549884f607f3f191827b4.tar.gz | |
Automerge with 5.1
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 6 | ||||
| -rw-r--r-- | extra/replace.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 8d6d18f0031..9c66cedc013 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -15,8 +15,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/sql -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ - ../dbug/libdbug.a ../strings/libmystrings.a \ +LDADD = @CLIENT_EXTRA_LDFLAGS@ \ + $(top_builddir)/mysys/libmysys.a \ + $(top_builddir)/strings/libmystrings.a \ + $(top_builddir)/dbug/libdbug.a \ $(ZLIB_LIBS) BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(top_builddir)/include/sql_state.h \ diff --git a/extra/replace.c b/extra/replace.c index 40bddf6d8fb..47993857a43 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -1085,7 +1085,7 @@ static int convert_file(REPLACE *rep, char * name) my_fclose(in,MYF(0)); my_fclose(out,MYF(0)); if (updated && ! error) - my_redel(org_name,tempname,MYF(MY_WME | MY_LINK_WARNING)); + my_redel(org_name, tempname, 0, MYF(MY_WME | MY_LINK_WARNING)); else my_delete(tempname,MYF(MY_WME)); if (!silent && ! error) |