diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
| commit | 926aaf4635c16f64d46d4fcbbbefb3aefca7a601 (patch) | |
| tree | dca0acd2a01c113582c29effe5312d2ffc0fb398 /extra | |
| parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
| parent | 7f91cf0861fb4e318b973c0fe1a2e632e9b587ea (diff) | |
| download | mariadb-git-926aaf4635c16f64d46d4fcbbbefb3aefca7a601.tar.gz | |
Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*
since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/replace.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 75422c4ee11..0ef679edcac 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -22,7 +22,8 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(top_builddir)/include/sql_state.h \ $(top_builddir)/include/mysqld_ername.h pkginclude_HEADERS= $(BUILT_SOURCES) -DISTCLEANFILES = $(BUILT_SOURCES) +EXTRA_PROGRAMS = comp_err +DISTCLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS) SUBDIRS = @yassl_dir@ DIST_SUBDIRS = yassl @@ -50,7 +51,6 @@ bin_PROGRAMS += innochecksum endif noinst_PROGRAMS = charset2html -EXTRA_PROGRAMS = comp_err EXTRA_DIST = CMakeLists.txt perror.o: perror.c diff --git a/extra/replace.c b/extra/replace.c index 9b7695eddcb..e254a5e7176 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -136,6 +136,7 @@ int main(int argc, char *argv[]) } } free_buffer(); + my_free(replace, MYF(0)); my_end(verbose ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR); exit(error ? 2 : 0); return 0; /* No compiler warning */ |