From: magnus.blaudd
Date: November 6 2012 9:10am
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4647 to 4648)
List-Archive: http://lists.mysql.com/commits/145162
Message-Id: <20121106091005.26841.84807.4648@wholphin>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4648 magnus.blaudd@stripped	2012-11-06 [merge]
      Merge 7.0 -> 7.1

    added:
      mysql-test/suite/ndb/t/ndb_cache.cnf
      mysql-test/suite/ndb/t/ndb_cache2.cnf
      mysql-test/suite/ndb/t/ndb_cache_multi.cnf
      mysql-test/suite/ndb/t/ndb_cache_multi2.cnf
      mysql-test/suite/ndb/t/ndb_cache_trans.cnf
      mysql-test/suite/ndb/t/ndbinfo_cache.cnf
    modified:
      mysql-test/suite/ndb/r/ndbinfo_cache.result
      mysql-test/suite/ndb/t/ndbinfo_cache.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf
 4647 Jonas Oreland	2012-11-05 [merge]
      merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/ndbapi/Ndbif.cpp
=== modified file 'mysql-test/suite/ndb/r/ndbinfo_cache.result'
--- a/mysql-test/suite/ndb/r/ndbinfo_cache.result	2011-02-01 14:58:21 +0000
+++ b/mysql-test/suite/ndb/r/ndbinfo_cache.result	2012-11-01 14:10:31 +0000
@@ -12,5 +12,4 @@ Qcache_queries_in_cache	0
 show status like "Qcache_inserts";
 Variable_name	Value
 Qcache_inserts	0
-SET GLOBAL query_cache_size=default;
-SET GLOBAL query_cache_type=default;
+SET GLOBAL query_cache_size=0;

=== added file 'mysql-test/suite/ndb/t/ndb_cache.cnf'
--- a/mysql-test/suite/ndb/t/ndb_cache.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_cache.cnf	2012-11-01 14:00:12 +0000
@@ -0,0 +1,8 @@
+!include ../my.cnf 
+
+[mysqld]
+# Enable query cache support but set size to 0 in order
+# to allow the query cache to be dynamically configured
+# also in the future
+query_cache_type=1
+query_cache_size=0

=== added file 'mysql-test/suite/ndb/t/ndb_cache2.cnf'
--- a/mysql-test/suite/ndb/t/ndb_cache2.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_cache2.cnf	2012-11-01 14:00:12 +0000
@@ -0,0 +1 @@
+!include ndb_cache.cnf

=== added file 'mysql-test/suite/ndb/t/ndb_cache_multi.cnf'
--- a/mysql-test/suite/ndb/t/ndb_cache_multi.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_cache_multi.cnf	2012-11-01 14:00:12 +0000
@@ -0,0 +1 @@
+!include ndb_cache.cnf

=== added file 'mysql-test/suite/ndb/t/ndb_cache_multi2.cnf'
--- a/mysql-test/suite/ndb/t/ndb_cache_multi2.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_cache_multi2.cnf	2012-11-01 14:00:12 +0000
@@ -0,0 +1 @@
+!include ndb_cache.cnf

=== added file 'mysql-test/suite/ndb/t/ndb_cache_trans.cnf'
--- a/mysql-test/suite/ndb/t/ndb_cache_trans.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_cache_trans.cnf	2012-11-01 14:00:12 +0000
@@ -0,0 +1 @@
+!include ndb_cache.cnf

=== added file 'mysql-test/suite/ndb/t/ndbinfo_cache.cnf'
--- a/mysql-test/suite/ndb/t/ndbinfo_cache.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndbinfo_cache.cnf	2012-11-01 14:00:12 +0000
@@ -0,0 +1 @@
+!include ndb_cache.cnf

=== modified file 'mysql-test/suite/ndb/t/ndbinfo_cache.test'
--- a/mysql-test/suite/ndb/t/ndbinfo_cache.test	2011-02-01 14:58:21 +0000
+++ b/mysql-test/suite/ndb/t/ndbinfo_cache.test	2012-11-01 14:10:31 +0000
@@ -24,8 +24,6 @@ select * from counters;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
 
-# Turn off query cache
-SET GLOBAL query_cache_size=default;
-SET GLOBAL query_cache_type=default;
+SET GLOBAL query_cache_size=0;
 
 --source ndbinfo_drop.inc

=== 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-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test	2012-10-24 12:49:46 +0000
@@ -188,10 +188,12 @@ set GLOBAL slave_transaction_retries=1;
 --echo **** On Master ****
 UPDATE t1 SET `nom`="DEAD" WHERE `nid`=1;
 
---echo **** On Slave ****
 # Wait for deadlock to be detected.
 # When detected, the slave will stop, so we just wait for it to stop.
-connection slave;
+# Use different connection to slave to avoid implicit commit
+# caused by START SLAVE
+--connection slave1
+--echo **** On Slave ****
 
 # Replication should have stopped, since max retries were not enough.
 # verify with show slave status
@@ -211,7 +213,9 @@ source include/start_slave.inc;
 # retries have been made. See BUG#35183.
 sleep 5;
 
-# commit transaction to release lock on row and let replication succeed
+# Switch back to the slave connection with the lock and commit the
+# transaction to release lock on row and let replication succeed
+--connection slave
 select * from t1 order by nid;
 COMMIT;
 

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf	2011-06-16 12:36:28 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf	2012-10-23 12:57:46 +0000
@@ -5,6 +5,10 @@
 # All MySQLDs log-apply-status
 # Infinite loops broken in the test using Ignore_server_ids mechanism
 
+[cluster_config.slave]
+# Add extra mysqld to second cluster
+mysqld=,
+
 [mysqld.1.1]
 server-id= 1
 log-bin

No bundle (reason: useless for push emails).