diff options
| author | unknown <joerg@trift-lap.fambruehe> | 2007-04-26 17:11:33 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.fambruehe> | 2007-04-26 17:11:33 +0200 |
| commit | e5d9fdcd828ab383c003c81217edfffe2400ae06 (patch) | |
| tree | 24ee23cf3e00208526f0654d43d6cf628b530e2a /Makefile.am | |
| parent | 4b1916358aaae534c47b029ee56d6a3354f3e3ed (diff) | |
| parent | 11a36eb5ecbb495c32a26be6e075e617bdfb5c27 (diff) | |
| download | mariadb-git-e5d9fdcd828ab383c003c81217edfffe2400ae06.tar.gz | |
Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
into trift-lap.fambruehe:/MySQL/M51/push-5.1
mysql-test/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
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
No need to propagate 5.0 changes into a 5.1 file which is deleted anyway.
Makefile.am:
Add "funcs_1" and "funcs_2" to the 5.1 version of the "test-bt" target.
storage/ndb/src/ndbapi/NdbImpl.hpp:
Manual merge from 5.0.40
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 c9f86f76058..cbca477fbf7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,6 +123,10 @@ test-bt: -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \ --with-ndbcluster-only + -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 \ |