3935 Martin Skold 2012-06-08
Merge missmatch in result file, regenerated
modified:
mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
3934 Martin Skold 2012-06-08 [merge]
Merge from 7.1
added:
storage/ndb/tools/ndb_blob_tool.cpp
modified:
mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java
storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
storage/ndb/tools/CMakeLists.txt
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result 2012-06-07 09:06:47 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result 2012-06-08 12:57:53 +0000
@@ -1,10 +1,5 @@
include/master-slave.inc
[connection master]
-# Timeout in include/wait_show_condition.inc for
-# show_statement : SHOW PROCESSLIST
-# field : State
-# condition : = 'Has read all relay log; waiting for the slave I/O thread to update it'
-# max_run_time : 31
include/assert.inc [Assert that relay log space is close to the limit]
include/diff_tables.inc [master:test.t1,slave:test.t1]
include/rpl_end.inc
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (Martin.Skold:3934 to 3935) | Martin Skold | 9 Jun |
