diff options
| author | aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi <> | 2006-11-13 13:20:35 +0200 |
|---|---|---|
| committer | aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi <> | 2006-11-13 13:20:35 +0200 |
| commit | 2b2529de79dfe4211d0b3d23cc9d8bb49d031687 (patch) | |
| tree | 47a97f5ae2a4f7eb413a5f73242f33cea184a440 | |
| parent | 7b0eb936d1457593668758f180df98cf556daade (diff) | |
| download | mariadb-git-2b2529de79dfe4211d0b3d23cc9d8bb49d031687.tar.gz | |
WL#3368 mixed binlog_format default
An amendment for parsing argument in case NDB is compiled and active.
NDB switches from mixed to row-based and back per each query. The previous patch
was not aware of such behaviour and made exceptional assingment to row-based when
no command line arg --binlog-format provided.
Removing #if HAVE_NDB_BINLOG block alltogether: ndb supports mixed and if server
was build without NDB using binlog nothing to care.
Test for this piece of code is rather specific. While there is active bug23110
ndb_alter_table and some other should fail if no explict --binlog-format is given:
mysql-test-run ndb_alter_table
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a6b063a47d4..7ada070da66 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3147,11 +3147,6 @@ with --log-bin instead."); } if (global_system_variables.binlog_format == BINLOG_FORMAT_UNSPEC) { -#if defined(HAVE_NDB_BINLOG) && defined(HAVE_ROW_BASED_REPLICATION) - if (opt_bin_log && have_ndbcluster == SHOW_OPTION_YES) - global_system_variables.binlog_format= BINLOG_FORMAT_ROW; - else -#endif #if defined(HAVE_ROW_BASED_REPLICATION) global_system_variables.binlog_format= BINLOG_FORMAT_MIXED; #else |