bzr push into mysql-5.5-cluster-7.2 branch (frazer.clement:4133 to 4134)

[Frazer Clement]

 4134 Frazer Clement	2012-12-03 [merge]
      Merge 7.1->7.2

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.test
 4133 Pekka Nousiainen	2012-12-03 [merge]
      merge 7.1->7.2

    modified:
      storage/ndb/test/ndbapi/testUpgrade.cpp
      storage/ndb/test/run-test/upgrade-tests.txt
      storage/ndb/test/src/HugoTransactions.cpp
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result	2011-09-09 09:30:43 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result	2012-12-03 17:25:05 +0000
@@ -593,12 +593,12 @@ Larry	50
 Newsagent	0
 Yacht dealer	50
 Exceptions at Primary bank site
-select server_id, master_server_id, count, auto_key, from_name, to_name, detail
-from test.transactions$EX order by count;
-server_id	master_server_id	count	auto_key	from_name	to_name	detail
-1	3	1	1	Larry	Employee-1	Payment to Employee-1
-1	3	2	2	Larry	Employee-2	Payment to Employee-2
-1	3	3	3	Employee-2	Newsagent	Buy yacht magazine
+select server_id, master_server_id, auto_key, from_name, to_name, detail
+from test.transactions$EX order by auto_key, from_name, to_name, detail;
+server_id	master_server_id	auto_key	from_name	to_name	detail
+1	3	1	Larry	Employee-1	Payment to Employee-1
+1	3	2	Larry	Employee-2	Payment to Employee-2
+1	3	3	Employee-2	Newsagent	Buy yacht magazine
 Conflict handling activity at Primary bank site
 Expect :
 1 conflict from slave T1 on Larry's balance

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf	2011-09-28 10:46:30 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf	2012-12-03 17:25:05 +0000
@@ -11,6 +11,9 @@
 # Potential infinite loops are broken by both servers
 # on each cluster having the same server-id
 
+[cluster_config]
+MaxNoOfExecutionThreads=8
+
 [cluster_config.slave]
 mysqld=,
 

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.test	2011-09-09 09:30:43 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.test	2012-12-03 17:25:05 +0000
@@ -477,9 +477,11 @@ select * from test.transactions order by
 select * from test.balances order by name;
 
 --echo Exceptions at Primary bank site
-
-select server_id, master_server_id, count, auto_key, from_name, to_name, detail
-  from test.transactions$EX order by count;
+# Note count not included here as it's non-deterministic
+# (CompletedOperations list order related to actual completion order related to
+#  universal randomness)
+select server_id, master_server_id, auto_key, from_name, to_name, detail
+  from test.transactions$EX order by auto_key, from_name, to_name, detail;
 
 --echo Conflict handling activity at Primary bank site
 --echo Expect :

No bundle (reason: useless for push emails).