From: Martin Skold
Date: June 22 2011 4:40pm
Subject: bzr push into mysql-5.5-cluster-alter branch (Martin.Skold:3357 to 3358)
List-Archive: http://lists.mysql.com/commits/139698
Message-Id: <20110622164040.0A4789F8D75@quadfish>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3358 Martin Skold	2011-06-22
      Removed printout of error message since it depends on binlog position

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test
 3357 Martin Skold	2011-06-22
      Tablespace for memory tables is now allowed, changed test and regenerated result

    modified:
      mysql-test/suite/ndb/r/ndb_dd_ddl.result
      mysql-test/suite/ndb/t/ndb_dd_ddl.test
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result	2011-06-22 15:41:41 +0000
@@ -137,7 +137,6 @@ set GLOBAL slave_transaction_retries=1;
 UPDATE t1 SET `nom`="DEAD" WHERE `nid`=1;
 **** On Slave ****
 include/wait_for_slave_sql_error.inc [errno=1205 ]
-Last_SQL_Error = 'Error 'Lock wait timeout exceeded; try restarting transaction' on query. Default database: ''. Query: 'COMMIT''
 set GLOBAL slave_transaction_retries=10;
 include/start_slave.inc
 select * from t1 order by nid;

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test	2011-06-22 15:41:41 +0000
@@ -198,7 +198,7 @@ connection slave;
 # verify with show slave status
 # 1205 = ER_LOCK_WAIT_TIMEOUT 
 --let $slave_sql_errno= 1205 
---let $show_slave_sql_error= 1 
+--let $show_slave_sql_error= 0
 --source include/wait_for_slave_sql_error.inc
 
 # now set max retries high enough to succeed, and start slave again

No bundle (reason: useless for push emails).