diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-02 16:44:22 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-02 16:44:22 +0100 |
| commit | c93a8ebbd584d4a11c32cb97385233bd74b248a3 (patch) | |
| tree | 68b5fd453875b68f7b6a12bf37a58ef3870a6bbb /mysql-test | |
| parent | 87606e8cec0316255287eeb242860858e82ba6de (diff) | |
| parent | eaf466d26a4b84803998bbbb0f6454b6f4e258fd (diff) | |
| download | mariadb-git-c93a8ebbd584d4a11c32cb97385233bd74b248a3.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql51
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -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 a14272eb164..82b894c28af 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2316,6 +2316,7 @@ sub mysqld_arguments ($$$$$$) { mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, $opt_ndbconnectstring); + mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); } } @@ -2383,6 +2384,7 @@ sub mysqld_arguments ($$$$$$) { mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, $opt_ndbconnectstring_slave); + mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); } } # end slave |