Commit 421f4c09 authored by unknown's avatar unknown

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


sql/mysqld.cc:
  ndb accepts mixed binlog_format switching to row internally via calling
  thd->set_binlog_format_row_if_mixed at the beginning and careful
  the->reset_current_stmt_binlog_row_based(). There is 
  bug#23110 to implement it all carefully for DDL.
parent 9b50b662
...@@ -3147,11 +3147,6 @@ with --log-bin instead."); ...@@ -3147,11 +3147,6 @@ with --log-bin instead.");
} }
if (global_system_variables.binlog_format == BINLOG_FORMAT_UNSPEC) 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) #if defined(HAVE_ROW_BASED_REPLICATION)
global_system_variables.binlog_format= BINLOG_FORMAT_MIXED; global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment