Skip to content

M
MariaDB
Commit 957d0156 authored by unknown's avatar unknown
Browse files
Options

Merge trift2.:/MySQL/M50/push-5.0 

into  trift2.:/MySQL/M51/push-5.1


Makefile.am:
  Manual merge.
parents d4c41aeb 054201f4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
Makefile.am
View file @ 957d0156
...@@ -136,6 +136,14 @@ test-bt: ...@@ -136,6 +136,14 @@ test-bt:
@PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl @PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
-if [ -d mysql-test/suite/nist ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
fi
-if [ -d mysql-test/suite/nist ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
fi
# Re-enable the "rowlock" suite when bug#28685 is fixed # Re-enable the "rowlock" suite when bug#28685 is fixed
# -cd mysql-test ; MTR_BUILD_THREAD=auto \ # -cd mysql-test ; MTR_BUILD_THREAD=auto \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7