diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-12 23:38:59 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-12 23:38:59 +0300 |
| commit | e5588c7deea8b03e0291017bc2c9f6e2027a6201 (patch) | |
| tree | 2a2432e481d124691d9fa4b39d8a192264178bd1 /Makefile.am | |
| parent | dee03a1c5d25307f1a1dc74765f0eb0ced730166 (diff) | |
| parent | 41d77d0579e013ffd8778382b584f4168c90fbc8 (diff) | |
| download | mariadb-git-e5588c7deea8b03e0291017bc2c9f6e2027a6201.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- extra/comp_err.c
- mysql-test/collections/default.experimental
- mysql-test/r/archive.result
- mysql-test/r/select.result
- mysql-test/suite/binlog/r/binlog_unsafe.result
- mysql-test/suite/binlog/t/binlog_unsafe.test
- mysql-test/suite/rpl/t/disabled.def
- mysql-test/t/archive.test
- mysql-test/t/select.test
- sql/item.cc
- sql/item.h
- sql/item_timefunc.cc
- sql/sql_base.cc
- sql/sql_delete.cc
- sql/sql_load.cc
- sql/sql_partition.cc
- sql/sql_table.cc
- storage/innobase/handler/ha_innodb.cc
- vio/vio.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index fd55ec099fa..d98db920701 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,10 +199,6 @@ test-bt-fast: -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress $(EXP) -test-bt-fast: - -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol --report-features - test-bt-debug: -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=debug --force --timer \ |