diff options
| author | unknown <holyfoot@mysql.com> | 2006-01-23 11:59:31 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-01-23 11:59:31 +0400 |
| commit | 793a8bb7c3b237ae73fbe7edab1672b8d48bfb5d (patch) | |
| tree | 388c5aee815346e2a7a5e27f08fc2539f026e738 /mysql-test/mysql-test-run.pl | |
| parent | 4649ac07467c0912d51480e101f8d63d5859ec2a (diff) | |
| parent | 823ec15c65d9831fdf3a3521b214dbf1a20ca1ec (diff) | |
| download | mariadb-git-793a8bb7c3b237ae73fbe7edab1672b8d48bfb5d.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d4c68184627..9e5e03483fa 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -712,6 +712,8 @@ sub command_line_setup () { $glob_use_embedded_server= 1; push(@glob_test_mode, "embedded"); $opt_skip_rpl= 1; # We never run replication with embedded + $opt_skip_ndbcluster= 1; # Avoid auto detection + $opt_skip_ssl= 1; if ( $opt_extern ) { |