diff options
| author | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
| commit | ceadd59644981c103831d9c20b1f06bbab337989 (patch) | |
| tree | d53c392b402d00eeeb5b401ac93da40017f87801 /Makefile.am | |
| parent | 7bb3501ff901d62fe249373e848a81c3c0e973b8 (diff) | |
| parent | 6c7a278c836c086d59a84589988536d654fd0a57 (diff) | |
| download | mariadb-git-ceadd59644981c103831d9c20b1f06bbab337989.tar.gz | |
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-maria1
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysys/mf_tempfile.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
BUILD/compile-dist:
SCCS merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f29764e4143..10201e4df63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,7 +102,7 @@ test-binlog-statement: cd mysql-test ; \ @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement -test: test-unit test-ns test-pr +test: test-ns test-pr test-full: test test-nr test-ps |