diff options
| author | unknown <joerg@trift-lap.fambruehe> | 2007-04-26 16:48:53 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.fambruehe> | 2007-04-26 16:48:53 +0200 |
| commit | 11a36eb5ecbb495c32a26be6e075e617bdfb5c27 (patch) | |
| tree | d7702bc7b9c02ac6d8a86dad5b682eaf7a988df0 /Makefile.am | |
| parent | 7115585f27362ae2c74f7c4998f1937d225705ca (diff) | |
| parent | 0d3c4483530469670b05acc77b853aad6b78a6e7 (diff) | |
| download | mariadb-git-11a36eb5ecbb495c32a26be6e075e617bdfb5c27.tar.gz | |
Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0
into trift-lap.fambruehe:/MySQL/M50/push-5.0
Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
sql/item_subselect.h:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Manual merge: Use the symbolic constant.
ndb/test/ndbapi/testScanFilter.cpp:
Manual merge: Use the standard text.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9e9520c29d8..992a6f6d755 100644 --- a/Makefile.am +++ b/Makefile.am @@ -153,6 +153,10 @@ test-bt: @PERL@ ./mysql-test-run.pl --force --comment=normal --report-features -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol + -cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1 + -cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2 test-bt-debug: -cd mysql-test ; MTR_BUILD_THREAD=auto \ |