From: magnus.blaudd
Date: November 21 2011 8:10pm
Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3417 to 3419)
List-Archive: http://lists.mysql.com/commits/142105
Message-Id: <201111212011.pALKBEkE013192@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3419 magnus.blaudd@stripped	2011-11-21
      main.information_schema
       - output from unordered query differs from trunk -> record  new .result file

    modified:
      mysql-test/r/information_schema.result
 3418 magnus.blaudd@stripped	2011-11-21
      rpl_ndb
       - add result for newly added testcase by copying from
       rpl_insert_ignore.result

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result
 3417 magnus.blaudd@stripped	2011-11-21
      ndb
       - fix .result file for ndb_cursor, wheter or not it returns a warning
         is not interetsing. Besides that warning seems to be random from version to
         version

    modified:
      mysql-test/suite/ndb/r/ndb_cursor.result
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2011-10-27 12:19:57 +0000
+++ b/mysql-test/r/information_schema.result	2011-11-21 20:03:02 +0000
@@ -879,8 +879,8 @@ TABLES	TABLE_NAME	select
 TABLE_CONSTRAINTS	TABLE_NAME	select
 TABLE_PRIVILEGES	TABLE_NAME	select
 VIEWS	TABLE_NAME	select
-INNODB_BUFFER_PAGE	TABLE_NAME	select
 INNODB_BUFFER_PAGE_LRU	TABLE_NAME	select
+INNODB_BUFFER_PAGE	TABLE_NAME	select
 delete from mysql.user where user='mysqltest_4';
 delete from mysql.db where user='mysqltest_4';
 flush privileges;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result	2011-04-08 12:48:50 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result	2011-11-21 19:40:46 +0000
@@ -25,5 +25,18 @@ include/diff_tables.inc [master:test.t1 
 INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
 include/assert.inc [Count of elements in t1 should be 6.]
 include/assert.inc [In SBR or MIXED modes, the event in the binlog should be the same that was executed. In RBR mode, binlog position should stay unchanged.]
+DROP TABLE t1;
+DROP TABLE t2;
+CREATE TABLE t1 (
+a INT UNSIGNED NOT NULL PRIMARY KEY
+) ENGINE=NDB;
+CREATE TABLE t2 (
+a INT UNSIGNED
+) ENGINE=NDB;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+INSERT INTO t1 SELECT t2.a FROM t2 ORDER BY t2.a ON DUPLICATE KEY UPDATE t1.a= t1.a;
+include/assert.inc [Sum of elements in t1 should be 1.]
+include/assert.inc [In SBR or MIXED modes, the event in the binlog should be the same that was executed. In RBR mode, binlog position should stay unchanged.]
 drop table t1, t2;
 include/rpl_end.inc

No bundle (reason: useless for push emails).