diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-31 10:44:20 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-31 10:44:20 +0200 |
| commit | ec952f21f8a4386045f5e5ac6fe44bf856ff2738 (patch) | |
| tree | 838752100454a55cfd45263336009cdf49830581 /mysys | |
| parent | 7806888465090c2fa3fb7ef7a8ffb0d149fcff07 (diff) | |
| parent | ea3ffb9b3efedc03baf011467a0b84f394b1b19e (diff) | |
| download | mariadb-git-ec952f21f8a4386045f5e5ac6fe44bf856ff2738.tar.gz | |
Merge
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index c59d15d59f5..98f9e13c778 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -100,7 +100,7 @@ test_io_cache: mf_iocache.c $(LIBRARIES) test_dir: test_dir.c $(LIBRARIES) $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS) -test_charset$(EXEEXT): test_charset.c $(LIBRARIES) +test_charset: test_charset.c $(LIBRARIES) $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS) testhash: testhash.c $(LIBRARIES) |