diff options
| author | monty@mysql.com <> | 2006-06-29 03:24:33 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-06-29 03:24:33 +0300 |
| commit | 3f22bc07c68cdd0b10d3365067d9bdeefb2fcfd7 (patch) | |
| tree | ac0989cabf87270fd2b2777c3c1e77ad1e4abb24 | |
| parent | 7b0f8635ae7d303c5b180564be80f086f396fd9e (diff) | |
| download | mariadb-git-3f22bc07c68cdd0b10d3365067d9bdeefb2fcfd7.tar.gz | |
Fixed failing test rpl_ndb_auto_inc.test
Mark events_stress.test as 'big' as it's very slow on some machines
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | mysql-test/t/events_stress.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl_ndb_auto_inc.test | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index c90b5c651ab..d570c36c7f5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1780,3 +1780,4 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj +server-tools/instance-manager/net_serv.cc diff --git a/mysql-test/t/events_stress.test b/mysql-test/t/events_stress.test index a3a683a0a1a..6546bce3a76 100644 --- a/mysql-test/t/events_stress.test +++ b/mysql-test/t/events_stress.test @@ -1,5 +1,6 @@ # Can't test with embedded server that doesn't support grants --- source include/not_embedded.inc +--source include/not_embedded.inc +--source include/big_test.inc CREATE DATABASE IF NOT EXISTS events_test; # diff --git a/mysql-test/t/rpl_ndb_auto_inc.test b/mysql-test/t/rpl_ndb_auto_inc.test index a9cc9563d88..0fc31de9b3a 100644 --- a/mysql-test/t/rpl_ndb_auto_inc.test +++ b/mysql-test/t/rpl_ndb_auto_inc.test @@ -6,7 +6,8 @@ # Date: 2006-02-10 # Change: Augmented test to use with cluster ##################################### --- source include/master-slave.inc +--source include/master-slave.inc +--source include/have_binlog_format_mixed_or_row.inc --echo ***************** Test 1 ************************ --echo |