List:Commits« Previous MessageNext Message »
From:Tomas Ulin Date:August 19 2008 8:30am
Subject:bzr push into mysql-5.1 branch (tomas.ulin:2650 to 2651)
View as plain text  
 2651 Tomas Ulin	2008-08-19
      yet another fix for reset master
modified:
  sql/ha_ndbcluster_binlog.cc

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

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2008-08-19 06:30:59 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2008-08-19 08:29:27 +0000
@@ -501,7 +501,8 @@ static int ndbcluster_reset_logs(THD *th
     return 0;
 
   /* only reset master should reset logs */
-  if (!(thd->lex->type & REFRESH_MASTER))
+  if (!((thd->lex->sql_command == SQLCOM_RESET) &&
+        (thd->lex->type & REFRESH_MASTER)))
     return 0;
 
   DBUG_ENTER("ndbcluster_reset_logs");

Thread
bzr push into mysql-5.1 branch (tomas.ulin:2650 to 2651) Tomas Ulin19 Aug