bzr push into mysql-trunk-cluster branch (magnus.blaudd:3384 to 3385)

[magnus.blaudd]

 3385 magnus.blaudd@stripped	2011-10-05 [merge]
      Merge

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
      mysql-test/t/disabled.def
      mysql-test/t/mysql_plugin.test
 3384 Frazer Clement	2011-10-04 [merge]
      Merge 5.5-cluster -> trunk-cluster

    modified:
      mysql-test/r/mysqld--help-win.result
      sql/sql_acl.cc
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result	2011-05-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result	2011-10-04 13:53:41 +0000
@@ -1,6 +1,6 @@
 include/master-slave.inc
 [connection master]
-SET storage_engine=myisam;
+SET default_storage_engine=myisam;
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
 --- Start test 1 Basic testing ---

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test	2011-05-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test	2011-10-04 13:53:41 +0000
@@ -10,6 +10,6 @@
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
 -- source suite/ndb_rpl/ndb_master-slave.inc
-SET storage_engine=myisam;
+SET default_storage_engine=myisam;
 --source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result	2011-04-15 12:45:47 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result	2011-10-04 13:26:15 +0000
@@ -8,6 +8,6 @@ stop slave;
 start slave;
 select max(a) from t1;
 max(a)
-8000
+loop_max
 drop table t1;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result	2011-10-04 13:20:45 +0000
@@ -481,6 +481,7 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @sav
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
 call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/rpl_reset.inc
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2011-04-19 12:52:12 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result	2011-10-04 13:15:44 +0000
@@ -34,8 +34,6 @@ INSERT INTO t1 VALUES ('MySQL','1993-02-
 END|
 CALL p2();
 CALL p1();
-Warnings:
-Error	1329	No data - zero rows fetched, selected, or processed
 DROP TABLE t1;
 DROP TABLE t2;
 DROP PROCEDURE p1;

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-10-03 07:11:46 +0000
+++ b/mysql-test/t/disabled.def	2011-10-04 10:41:43 +0000
@@ -17,3 +17,4 @@ create-big               : Bug#11748731 
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 mysql_embedded           : Bug#12561297 seems to be fixed in 5.5.16 (I verified that it fails also in tag:mysql-5.5.15)
+file_contents            : Bug#12585902 file_contents.test fails when building from "bzr export"

=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-09-23 10:55:10 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-10-04 11:21:36 +0000
@@ -288,12 +288,12 @@ let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n 
 --echo #
 --echo # Show the help.
 --echo #
-replace_result $MYSQL_PLUGIN mysql_plugin;
---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/
+--replace_result $MYSQL_PLUGIN mysql_plugin $MYSQL_SERVER_VERSION XX.XX.XX
+--replace_regex /Ver [0-9.]+/Ver V.V.VV/
 --exec $MYSQL_PLUGIN --help
 
-replace_result $MYSQL_PLUGIN mysql_plugin;
---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/
+--replace_result $MYSQL_PLUGIN mysql_plugin $MYSQL_SERVER_VERSION XX.XX.XX
+--replace_regex /Ver [0-9.]+/Ver V.V.VV/
 --exec $MYSQL_PLUGIN --version
 
 #

No bundle (reason: useless for push emails).