Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-03-27 22:38:55+01:00, tomas@stripped +7 -0
correct merge + remove warnings
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@stripped, 2008-03-27 22:38:50+01:00, tomas@stripped +2 -2
correct merge + remove warnings
mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2008-03-27 22:38:50+01:00, tomas@stripped +2 -2
correct merge + remove warnings
sql/ha_ndbcluster.cc@stripped, 2008-03-27 22:38:50+01:00, tomas@stripped +1 -1
correct merge + remove warnings
sql/rpl_mi.cc@stripped, 2008-03-27 22:38:51+01:00, tomas@stripped +2 -3
correct merge + remove warnings
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@stripped, 2008-03-27 22:38:51+01:00, tomas@stripped +1 -1
correct merge + remove warnings
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp@stripped, 2008-03-27 22:38:51+01:00, tomas@stripped +1 -1
correct merge + remove warnings
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2008-03-27 22:38:51+01:00, tomas@stripped +4 -2
correct merge + remove warnings
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result 2008-03-27 17:04:16 +01:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result 2008-03-27 22:38:50 +01:00
@@ -439,7 +439,7 @@ Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 1364
-Last_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 447
+Last_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 448
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
@@ -457,7 +457,7 @@ Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1364
-Last_SQL_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 447
+Last_SQL_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 448
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Create t10 on slave ***
diff -Nrup a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
--- a/mysql-test/suite/rpl_ndb/t/disabled.def 2008-03-27 18:20:46 +01:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def 2008-03-27 22:38:50 +01:00
@@ -13,7 +13,7 @@
rpl_ndb_ctype_ucs2_def : bug #34661 rpl_ndb_ctype_ucs2_def fails in cge-6.3
rpl_ndb_innodb2ndb : Bug #34725 failing rpl_ndb.rpl_ndb_myisam/innodb2ndb
rpl_ndb_myisam2ndb : Bug #34725 failing rpl_ndb.rpl_ndb_myisam/innodb2ndb
-#rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular replication.
-#rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication.
+rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular replication.
+rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication.
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc 2008-03-27 18:20:46 +01:00
+++ b/sql/ha_ndbcluster.cc 2008-03-27 22:38:50 +01:00
@@ -7348,9 +7348,9 @@ ha_ndbcluster::ha_ndbcluster(handlerton
m_update_cannot_batch(FALSE),
m_skip_auto_increment(TRUE),
m_blobs_pending(0),
+ m_key_fields(NULL),
m_blobs_buffer(0),
m_blobs_buffer_size(0),
- m_key_fields(NULL),
m_dupkey((uint) -1),
m_autoincrement_prefetch((ha_rows) NDB_DEFAULT_AUTO_PREFETCH),
m_cond(NULL),
diff -Nrup a/sql/rpl_mi.cc b/sql/rpl_mi.cc
--- a/sql/rpl_mi.cc 2008-03-27 19:07:48 +01:00
+++ b/sql/rpl_mi.cc 2008-03-27 22:38:51 +01:00
@@ -30,10 +30,9 @@ int init_floatvar_from_file(float* var,
Master_info::Master_info()
:Slave_reporting_capability("I/O"),
- ssl(0), ssl_verify_server_cert(0), fd(-1), io_thd(0), inited(0),
- abort_slave(0),slave_running(0),
+ ssl(0), ssl_verify_server_cert(0), fd(-1), io_thd(0),
heartbeat_period(0), received_heartbeats(0),
- slave_run_id(0)
+ inited(0), abort_slave(0),slave_running(0), slave_run_id(0)
{
host[0] = 0; user[0] = 0; password[0] = 0; bind_addr[0] = 0;
ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;
diff -Nrup a/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp 2007-11-30 12:00:29 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp 2008-03-27 22:38:51 +01:00
@@ -122,9 +122,9 @@ void Dbdih::initRecords()
Dbdih::Dbdih(Block_context& ctx):
SimulatedBlock(DBDIH, ctx),
+ c_activeTakeOverList(c_takeOverPool),
c_waitGCPProxyList(waitGCPProxyPool),
c_waitGCPMasterList(waitGCPMasterPool)
- ,c_activeTakeOverList(c_takeOverPool)
{
BLOCK_CONSTRUCTOR(Dbdih);
diff -Nrup a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
--- a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2007-12-13 21:36:22 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp 2008-03-27 22:38:51 +01:00
@@ -625,8 +625,8 @@ public:
struct ApiConnectRecord {
ApiConnectRecord(ArrayPool<TcFiredTriggerData> & firedTriggerPool,
ArrayPool<TcIndexOperation> & seizedIndexOpPool):
- theFiredTriggers(firedTriggerPool),
isIndexOp(false),
+ theFiredTriggers(firedTriggerPool),
theSeizedIndexOperations(seizedIndexOpPool)
{}
diff -Nrup a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2008-03-27 17:04:19 +01:00
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2008-03-27 22:38:51 +01:00
@@ -1205,9 +1205,11 @@ NdbIndexImpl::getIndexTable() const
NdbOptimizeTableHandleImpl::NdbOptimizeTableHandleImpl(NdbDictionary::OptimizeTableHandle &f)
: NdbDictionary::OptimizeTableHandle(* this),
- m_ndb(NULL), m_table(NULL), m_trans(NULL), m_scan_op(NULL),
+ m_state(NdbOptimizeTableHandleImpl::CREATED),
+ m_ndb(NULL), m_table(NULL),
m_table_queue(NULL), m_table_queue_first(NULL), m_table_queue_end(NULL),
- m_facade(this), m_state(NdbOptimizeTableHandleImpl::CREATED)
+ m_trans(NULL), m_scan_op(NULL),
+ m_facade(this)
{
}
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2581) | tomas | 28 Mar |
