diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-19 12:35:17 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-19 12:35:17 +0200 |
| commit | 33d678fcdc2d0b431c0f08e11e0b6715cd37cda0 (patch) | |
| tree | e3b0f252f2776f41e8db495a24048a795b9019f4 /extra | |
| parent | 54c03ff73630ce782d3c982003989b12a3fa5728 (diff) | |
| parent | 7bc917e9e12c4be30628a09a56f75c6e0a669802 (diff) | |
| download | mariadb-git-33d678fcdc2d0b431c0f08e11e0b6715cd37cda0.tar.gz | |
merge with 3.23
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-depcomp:
Delete: depcomp
config.guess:
Auto merged
config.sub:
Auto merged
configure.in:
Auto merged
dbug/Makefile.am:
Auto merged
heap/Makefile.am:
Auto merged
install-sh:
Auto merged
isam/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
ltconfig:
Auto merged
ltmain.sh:
Auto merged
missing:
Auto merged
myisam/Makefile.am:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/mf_keycache.c:
Auto merged
regex/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
strings/Makefile.am:
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 58776144489..2d7dc95f616 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ -resolve_stack_dump mysql_install + resolve_stack_dump mysql_install # Don't update the files from bitkeeper %::SCCS/s.% |