diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-09 03:55:26 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-09 03:55:26 +0200 |
| commit | 9d812016c1287fe06a0c0715f0b2852c919cff82 (patch) | |
| tree | af09adc5a3ec6814545553d72fda1d33e443d162 /extra/Makefile.am | |
| parent | cd2f741d5d2cc52928668c6ce1f77052d1ca8a3b (diff) | |
| parent | cf2ef3c68f696707671a96c8a2ad6c8449390f4a (diff) | |
| download | mariadb-git-9d812016c1287fe06a0c0715f0b2852c919cff82.tar.gz | |
merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
client/mysqladmin.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
innobase/log/log0log.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/myisam.result:
Auto merged
sql/lex.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
configure.in:
merge with 4.0.9
innobase/btr/btr0pcur.c:
merge with 4.0.9
myisam/mi_check.c:
merge with 4.0.9
myisam/mi_search.c:
merge with 4.0.9
mysql-test/t/myisam.test:
merge with 4.0.9
sql/log_event.cc:
merge with 4.0.9
sql/mysql_priv.h:
merge with 4.0.9
sql/sql_lex.h:
merge with 4.0.9
sql/sql_parse.cc:
merge with 4.0.9
sql/sql_yacc.yy:
merge with 4.0.9
Diffstat (limited to 'extra/Makefile.am')
| -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 6895d7a09f8..8107beb2657 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include 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 mysql_waitpid # Don't update the files from bitkeeper %::SCCS/s.% |