diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-01-20 14:50:02 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-01-20 14:50:02 +0100 |
| commit | ba315e9bcd1d2545b5c590a1e2e7501320db4847 (patch) | |
| tree | 46df17bf11885c712e31dfd6f8dec7a7ea797693 /sql/mysqld.cc | |
| parent | 72a1ae420b5dfb816e6d0d24ad7993d0caeee8cc (diff) | |
| download | mariadb-git-ba315e9bcd1d2545b5c590a1e2e7501320db4847.tar.gz | |
option to run mysql-test-run without binlog
calculate ndbcluster slave port
mysql-test/mysql-test-run.pl:
calculate ndbcluster slave port
mysql-test/mysql-test-run.sh:
option to run mysql-test-run without binlog
sql/mysqld.cc:
option to run mysql-test-run without binlog
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5edd5e18a8d..98dbb41c0a8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3172,7 +3172,7 @@ with --log-bin instead."); if (opt_binlog_format_id == BF_UNSPECIFIED) { #ifdef HAVE_NDB_BINLOG - if (have_ndbcluster == SHOW_OPTION_YES) + if (opt_bin_log && have_ndbcluster == SHOW_OPTION_YES) opt_binlog_format_id= BF_ROW; else #endif |