bzr push into mysql-5.5-cluster branch (frazer.clement:3510 to 3511)

[Frazer Clement]

 3511 Frazer Clement	2011-09-21
      Fix Win testcase

    modified:
      mysql-test/r/mysqld--help-win.result
 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
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-05-10 09:48:14 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-09-21 21:58:35 +0000
@@ -234,6 +234,11 @@ The following options may be given as th
  ALWAYS use row-based binary logging, the security issues
  do not exist and the binary logging cannot break, so you
  can safely set this to TRUE
+ --log-bin-use-v1-row-events 
+ If equal to 1 then version 1 row events are written to a
+ row based binary log.  If equal to 0, then the latest
+ version of events are written.  This option is useful
+ during some upgrades.
  --log-error[=name]  Error log file
  --log-isam[=name]   Log all MyISAM changes to file.
  --log-output=name   Syntax: log-output=value[,value...], where "value" could
@@ -811,6 +816,7 @@ lock-wait-timeout 31536000
 log-bin (No default value)
 log-bin-index (No default value)
 log-bin-trust-function-creators FALSE
+log-bin-use-v1-row-events FALSE
 log-error 
 log-isam myisam.log
 log-output FILE

No bundle (reason: useless for push emails).