bzr push into mysql-5.1 branch (tomas.ulin:2744 to 2745)

[Tomas Ulin]

 2745 Tomas Ulin	2008-11-13 [merge]
      merge
modified:
  sql/mysqld.cc

 2744 Jonas Oreland	2008-11-13 [merge]
      merge 62 to 63
modified:
  storage/ndb/include/ndb_version.h.in
  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
  storage/ndb/src/ndbapi/Ndbif.cpp
  storage/ndb/src/ndbapi/TransporterFacade.cpp

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-10-31 14:22:11 +0000
+++ b/sql/mysqld.cc	2008-11-13 16:40:12 +0000
@@ -3765,12 +3765,12 @@ with --log-bin instead.");
     }
     else
     {
-      global_system_variables.binlog_format= BINLOG_FORMAT_STMT;
+      global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
     }
   }
   else
     if (opt_binlog_format_id == BINLOG_FORMAT_UNSPEC)
-      global_system_variables.binlog_format= BINLOG_FORMAT_STMT;
+      global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
     else
     { 
       DBUG_ASSERT(global_system_variables.binlog_format != BINLOG_FORMAT_UNSPEC);