bk commit into 5.1 tree (aelkin:1.2349)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-13 13:20:35+02:00, aelkin@stripped
+1 -0
  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@stripped, 2006-11-13 13:20:31+02:00,
aelkin@stripped +0 -5
    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.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkibras-fe30f900-107.dhcp.inet.fi
# Root:	/home/elkin/MySQL/TEAM/FIXES/merge_50

--- 1.588/sql/mysqld.cc	2006-11-13 13:20:42 +02:00
+++ 1.589/sql/mysqld.cc	2006-11-13 13:20:42 +02:00
@@ -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