bzr push into mysql-5.5-cluster branch (jonas.oreland:3509 to 3510)

[Jonas Oreland]

 3510 Jonas Oreland	2011-09-21
      ndb dist priv - make sure binlog format is switched back to stmt before binlogging create/drop user. Wo/ this it crashed with "./mtr --mem --mysqld=--binlog-format=mixed rpl_ndb.rpl_ndb_dist_priv"

    modified:
      sql/sql_acl.cc
 3509 Frazer Clement	2011-09-21 [merge]
      Merge 7.1->5.5-cluster

    modified:
      mysql-test/suite/binlog/t/binlog_killed.test
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2011-09-01 12:10:36 +0000
+++ b/sql/sql_acl.cc	2011-09-21 14:06:04 +0000
@@ -1946,6 +1946,7 @@ bool change_password(THD *thd, const cha
       trans_rollback_stmt(thd);
     }
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 
@@ -1983,6 +1984,7 @@ end:
     DBUG_PRINT("info", ("%u: Aborting DDL transaction", __LINE__));
     trans_rollback_stmt(thd);
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 
@@ -3864,6 +3866,7 @@ int mysql_table_grant(THD *thd, TABLE_LI
       trans_rollback_stmt(thd);
     }
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 
@@ -4241,6 +4244,7 @@ bool mysql_grant(THD *thd, const char *d
       trans_rollback_stmt(thd);
     }
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 
@@ -6656,9 +6660,11 @@ bool mysql_create_user(THD *thd, List <L
                  ("%u: Commit DDL transaction failed: %d", __LINE__, err));
     }
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 
+
   if (some_users_created)
     result |= write_bin_log(thd, FALSE, thd->query(), thd->query_length());
 
@@ -6777,6 +6783,7 @@ bool mysql_drop_user(THD *thd, List <LEX
       trans_rollback_stmt(thd);
     }
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 
@@ -6911,6 +6918,7 @@ bool mysql_rename_user(THD *thd, List <L
       some_users_renamed= FALSE;
     }
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 
@@ -7151,6 +7159,7 @@ bool mysql_revoke_all(THD *thd,  List <L
       trans_rollback_stmt(thd);
     }
     assert(thd->transaction.stmt.is_empty());
+    thd->clear_current_stmt_binlog_format_row();
   }
 #endif
 

No bundle (reason: useless for push emails).