diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-04 10:12:44 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-04 10:12:44 +0300 |
| commit | f219357a092c8d3314810ed5c610a522cb3afec0 (patch) | |
| tree | 2a3a3aef7e31251fc00de36d29f1bfb8fcccb978 /mysql-test/mysql-test-run.pl | |
| parent | 14cea3563f8186aba5d21ea78f16898c3d103bbb (diff) | |
| parent | 7299858763289eab8c9fbe8048f86abebdf4d50d (diff) | |
| download | mariadb-git-f219357a092c8d3314810ed5c610a522cb3afec0.tar.gz | |
Merge mysql-5.1-innodb -> mysql-5.1-security
Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 .
There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a
failure for a test added in one of them. If that is resolved quickly
then those 8 more changesets will be merged too.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 820650b120e..0f19ed32216 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -129,7 +129,7 @@ my $path_config_file; # The generated config file, var/my.cnf # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb"; +my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin"; my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose |