bzr push into mysql-5.1 branch (tomas.ulin:2649 to 2650) Bug#38628

[Tomas Ulin]

 2650 Tomas Ulin	2008-08-19
      continued fix for reset master
modified:
  sql/ha_ndbcluster_binlog.cc

 2649 Jonas Oreland	2008-08-13
      ndb - bug#38628 - Fix invalid memory access in takeOverScanOp
        (causes bus-error on i.e sparc)
modified:
  storage/ndb/src/ndbapi/NdbScanOperation.cpp

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2008-08-08 09:14:45 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2008-08-19 06:30:59 +0000
@@ -500,6 +500,10 @@ static int ndbcluster_reset_logs(THD *th
   if (!ndb_binlog_running)
     return 0;
 
+  /* only reset master should reset logs */
+  if (!(thd->lex->type & REFRESH_MASTER))
+    return 0;
+
   DBUG_ENTER("ndbcluster_reset_logs");
 
   /*