diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-08-31 17:09:09 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-08-31 17:09:09 +0300 |
| commit | c6fd09d097f7a4572e64325470631b117d42b1fd (patch) | |
| tree | 17a12e46913f10f3753ac279b7753a0bbe3fd8f3 /mysql-test/collections | |
| parent | 38cb188e24be22d29a4911155eb34b54235219a2 (diff) | |
| parent | 8a2454f8e9fce648272577fcf8006ae6e6806cf9 (diff) | |
| download | mariadb-git-c6fd09d097f7a4572e64325470631b117d42b1fd.tar.gz | |
automerge 5.1-main -> 5.1-bugteam
Diffstat (limited to 'mysql-test/collections')
| -rw-r--r-- | mysql-test/collections/default.daily | 2 | ||||
| -rw-r--r-- | mysql-test/collections/default.push | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/collections/default.daily b/mysql-test/collections/default.daily index 194cc2aad59..56714662b8f 100644 --- a/mysql-test/collections/default.daily +++ b/mysql-test/collections/default.daily @@ -1 +1 @@ -perl mysql-test-run.pl --timer --force --comment=rpl_ndb_row --suite=rpl_ndb,ndb --mysqld=--binlog-format=row --experimental=collections/default.experimental +perl mysql-test-run.pl --timer --force --comment=rpl_ndb_row --vardir=var-rpl_ndb_row --suite=rpl_ndb,ndb --mysqld=--binlog-format=row --experimental=collections/default.experimental diff --git a/mysql-test/collections/default.push b/mysql-test/collections/default.push index 0f7c8d9949e..0503bd49f73 100644 --- a/mysql-test/collections/default.push +++ b/mysql-test/collections/default.push @@ -1,5 +1,5 @@ -perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental -perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental -perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --embedded --experimental=collections/default.experimental -perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental -perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental +perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental +perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental +perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded --vardir=var-emebbed --embedded --experimental=collections/default.experimental +perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental +perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental |