bzr commit into mysql-5.1 branch (jonas:2718)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/

 2718 Jonas Oreland	2008-08-20 [merge]
      merge 6.3 to 6.4
modified:
  sql/ha_ndbcluster_binlog.cc

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2008-08-10 19:01:25 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2008-08-20 16:18:38 +0000
@@ -502,6 +502,11 @@ static int ndbcluster_reset_logs(THD *th
   if (!ndb_binlog_running)
     return 0;
 
+  /* only reset master should reset logs */
+  if (!((thd->lex->sql_command == SQLCOM_RESET) &&
+        (thd->lex->type & REFRESH_MASTER)))
+    return 0;
+
   DBUG_ENTER("ndbcluster_reset_logs");
 
   /*