diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-06 18:08:21 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-06 18:08:21 +0200 |
| commit | 94814c6f5d1b50cdaa3e1eb3099d414ae51517b0 (patch) | |
| tree | 58654873cf8ce22238ea3d44d7433d404303e2a3 /extra | |
| parent | 840e08793a07ed957cc2a7b4c3e3db44fd117f8c (diff) | |
| parent | 9e7a1bb2b019a1a8048bc9ef8cdf00fcc255d812 (diff) | |
| download | mariadb-git-94814c6f5d1b50cdaa3e1eb3099d414ae51517b0.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 457fddce673..9fac05d0160 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -38,7 +38,7 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ - resolve_stack_dump mysql_waitpid innochecksum + resolve_stack_dump mysql_waitpid # innochecksum noinst_PROGRAMS = charset2html # Don't update the files from bitkeeper |