diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-22 16:22:31 +0300 |
| commit | 0ceeeafe85316e594d8ba42a6d0c3c29201944bf (patch) | |
| tree | 1d77daf398f43cbe5998ff4f0676165e6808927c /mysql-test/collections | |
| parent | 7a9f2e57e3325a56434704e9ba9fc4f424678a0b (diff) | |
| parent | 4836199d701af05a9c89563b642c51ee5640e804 (diff) | |
| download | mariadb-git-0ceeeafe85316e594d8ba42a6d0c3c29201944bf.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- mysql-test/r/mysqld--help-notwin.result
- mysql-test/r/mysqld--help-win.result
Diffstat (limited to 'mysql-test/collections')
| -rw-r--r-- | mysql-test/collections/default.experimental | 1 | ||||
| -rw-r--r-- | mysql-test/collections/test-bt | 10 | ||||
| -rw-r--r-- | mysql-test/collections/test-bt-debug | 1 | ||||
| -rw-r--r-- | mysql-test/collections/test-bt-debug-fast | 0 | ||||
| -rw-r--r-- | mysql-test/collections/test-bt-fast | 2 |
5 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index 52291c2b8f8..20a164f7f1b 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -15,6 +15,7 @@ main.outfile_loaddata @solaris # Bug#46895 2010-01-20 alik Test "outfi main.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled main.signal_demo3 @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun main.sp @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun +main.sp-error @windows # Bug#43201 2010-02-22 alik sp-error.test fails on Windows debug build in embedded mode. The patch will come from -bugfixing. rpl.rpl_heartbeat_basic # BUG#43828 2009-10-22 luis fails sporadically rpl.rpl_heartbeat_2slaves # BUG#43828 2009-10-22 luis fails sporadically diff --git a/mysql-test/collections/test-bt b/mysql-test/collections/test-bt new file mode 100644 index 00000000000..3127e2aecb9 --- /dev/null +++ b/mysql-test/collections/test-bt @@ -0,0 +1,10 @@ +perl mysql-test-run.pl --force --timer --comment=normal --skip-ndbcluster --report-features --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=ps --skip-ndbcluster --ps-protocol --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=funcs1+ps --suite=funcs_1 --ps-protocol --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=funcs2 --suite=funcs_2 --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=partitions --suite=parts --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=stress --suite=stress --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=jp --suite=jp --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=embedded --embedded-server --skip-rpl --skip-ndbcluster --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=nist --suite=nist --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=nist+ps --suite=nist --ps-protocol --experimental=collections/default.experimental diff --git a/mysql-test/collections/test-bt-debug b/mysql-test/collections/test-bt-debug new file mode 100644 index 00000000000..aec3d9fbef5 --- /dev/null +++ b/mysql-test/collections/test-bt-debug @@ -0,0 +1 @@ +perl mysql-test-run.pl --force --timer --comment=debug --skip-ndbcluster --skip-rpl --report-features --experimental=collections/default.experimental diff --git a/mysql-test/collections/test-bt-debug-fast b/mysql-test/collections/test-bt-debug-fast new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/mysql-test/collections/test-bt-debug-fast diff --git a/mysql-test/collections/test-bt-fast b/mysql-test/collections/test-bt-fast new file mode 100644 index 00000000000..c3ded443518 --- /dev/null +++ b/mysql-test/collections/test-bt-fast @@ -0,0 +1,2 @@ +perl mysql-test-run.pl --force --timer --comment=ps --skip-ndbcluster --ps-protocol --report-features --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --comment=stress --suite=stress --experimental=collections/default.experimental |