bzr push into mysql-5.1 branch (tomas.ulin:3075 to 3076)

[Tomas Ulin]

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

 3075 Tomas Ulin	2008-11-13
      reenable tc selection and add tc select for unique keys
modified:
  mysql-test/suite/ndb/r/ndb_basic.result
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster.h

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-11-08 09:16:43 +0000
+++ b/sql/mysqld.cc	2008-11-13 16:42:33 +0000
@@ -3763,12 +3763,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);