Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas 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
1.2386 05/08/18 14:07:31 jonas@eel.(none) +8 -0
Merge eel.(none):/home/jonas/src/mysql-4.1
into eel.(none):/home/jonas/src/mysql-4.1-push
mysql-test/t/ndb_alter_table.test
1.22 05/08/18 14:07:29 jonas@eel.(none) +0 -1
merge
sql/ha_ndbcluster.cc
1.170 05/08/18 14:04:50 jonas@eel.(none) +0 -0
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp
1.32 05/08/18 14:04:50 jonas@eel.(none) +0 -0
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp
1.62 05/08/18 14:04:50 jonas@eel.(none) +0 -0
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
1.14 05/08/18 14:04:50 jonas@eel.(none) +0 -0
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp
1.4 05/08/18 14:04:50 jonas@eel.(none) +0 -0
Auto merged
ndb/src/common/util/version.c
1.19 05/08/18 14:04:50 jonas@eel.(none) +0 -0
Auto merged
mysql-test/t/ndb_config.test
1.4 05/08/18 14:04:50 jonas@eel.(none) +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jonas
# Host: eel.(none)
# Root: /home/jonas/src/mysql-4.1-push/RESYNC
--- 1.3/mysql-test/t/ndb_config.test 2005-07-26 16:12:13 +02:00
+++ 1.4/mysql-test/t/ndb_config.test 2005-08-18 14:04:50 +02:00
@@ -6,3 +6,5 @@
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults -r \\n -f " " --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --type=ndbd --host=localhost 2> /dev/null
+
+# End of 4.1 tests
--- 1.21/mysql-test/t/ndb_alter_table.test 2005-07-28 02:21:44 +02:00
+++ 1.22/mysql-test/t/ndb_alter_table.test 2005-08-18 14:07:29 +02:00
@@ -147,7 +147,6 @@
connection server1;
alter table t1 drop index c;
connection server2;
---error 1105
select * from t1 where b = 'two';
select * from t1 where b = 'two';
connection server1;
@@ -175,5 +174,29 @@
#truncate table t2;
#select count(*) from t2;
#drop table t2;
+
+connection server1;
+create table t3 (a int primary key) engine=ndbcluster;
+
+connection server2;
+begin;
+insert into t3 values (1);
+
+connection server1;
+alter table t3 rename t4;
+
+connection server2;
+# This should work as transaction is ongoing...
+delete from t3;
+insert into t3 values (1);
+commit;
+
+# This should fail as its a new transaction
+--error 1015
+select * from t3;
+select * from t4;
+drop table t4;
+show tables;
+connection server1;
# End of 4.1 tests
--- 1.18/ndb/src/common/util/version.c 2005-07-14 18:02:04 +02:00
+++ 1.19/ndb/src/common/util/version.c 2005-08-18 14:04:50 +02:00
@@ -92,7 +92,8 @@
#ifndef TEST_VERSION
struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
- { MAKE_VERSION(4,1,NDB_VERSION_BUILD), MAKE_VERSION(4,1,10), UG_Range },
+ { MAKE_VERSION(4,1,NDB_VERSION_BUILD), MAKE_VERSION(4,1,15), UG_Range },
+ { MAKE_VERSION(4,1,14), MAKE_VERSION(4,1,10), UG_Range },
{ MAKE_VERSION(4,1,10), MAKE_VERSION(4,1,9), UG_Exact },
{ MAKE_VERSION(4,1,9), MAKE_VERSION(4,1,8), UG_Exact },
{ MAKE_VERSION(3,5,2), MAKE_VERSION(3,5,1), UG_Exact },
@@ -100,6 +101,7 @@
};
struct NdbUpGradeCompatible ndbCompatibleTable_upgrade[] = {
+ { MAKE_VERSION(4,1,15), MAKE_VERSION(4,1,14), UG_Exact },
{ MAKE_VERSION(3,5,4), MAKE_VERSION(3,5,3), UG_Exact },
{ 0, 0, UG_Null }
};
--- 1.3/ndb/src/kernel/blocks/qmgr/Qmgr.hpp 2005-07-14 18:02:05 +02:00
+++ 1.4/ndb/src/kernel/blocks/qmgr/Qmgr.hpp 2005-08-18 14:04:50 +02:00
@@ -220,6 +220,7 @@
void execAPI_VERSION_REQ(Signal* signal);
+ void execAPI_BROADCAST_REP(Signal* signal);
// Arbitration signals
void execARBIT_CFG(Signal* signal);
--- 1.13/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2005-07-14 18:02:05 +02:00
+++ 1.14/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp 2005-08-18 14:04:50 +02:00
@@ -34,6 +34,7 @@
#include <signaldata/BlockCommitOrd.hpp>
#include <signaldata/FailRep.hpp>
#include <signaldata/DisconnectRep.hpp>
+#include <signaldata/ApiBroadcast.hpp>
#include <ndb_version.h>
@@ -1702,16 +1703,6 @@
sendSignal(DBDICT_REF, GSN_API_FAILREQ, signal, 2, JBA);
sendSignal(SUMA_REF, GSN_API_FAILREQ, signal, 2, JBA);
- /**
- * GREP also need the information that an API node
- * (actually a REP node) has failed.
- *
- * GREP does however NOT send a CONF on this signal, i.e.
- * the API_FAILREQ signal to GREP is like a REP signal
- * (i.e. without any confirmation).
- */
- sendSignal(GREP_REF, GSN_API_FAILREQ, signal, 2, JBA);
-
/**-------------------------------------------------------------------------
* THE OTHER NODE WAS AN API NODE. THE COMMUNICATION LINK IS ALREADY
* BROKEN AND THUS NO ACTION IS NEEDED TO BREAK THE CONNECTION.
@@ -3925,3 +3916,30 @@
}// switch
#endif
}//execSET_VAR_REQ()
+
+void
+Qmgr::execAPI_BROADCAST_REP(Signal* signal)
+{
+ jamEntry();
+ ApiBroadcastRep api= *(const ApiBroadcastRep*)signal->getDataPtr();
+
+ Uint32 len = signal->getLength() - ApiBroadcastRep::SignalLength;
+ memmove(signal->theData, signal->theData+ApiBroadcastRep::SignalLength,
+ 4*len);
+
+ NodeBitmask mask;
+ NodeRecPtr nodePtr;
+ for (nodePtr.i = 1; nodePtr.i < MAX_NODES; nodePtr.i++)
+ {
+ jam();
+ ptrAss(nodePtr, nodeRec);
+ if (nodePtr.p->phase == ZAPI_ACTIVE &&
+ getNodeInfo(nodePtr.i).m_version >= api.minVersion)
+ {
+ mask.set(nodePtr.i);
+ }
+ }
+
+ NodeReceiverGroup rg(API_CLUSTERMGR, mask);
+ sendSignal(rg, api.gsn, signal, len, JBB); // forward sections
+}
--- 1.61/ndb/src/mgmsrv/MgmtSrvr.cpp 2005-07-15 13:32:05 +02:00
+++ 1.62/ndb/src/mgmsrv/MgmtSrvr.cpp 2005-08-18 14:04:50 +02:00
@@ -2561,44 +2561,7 @@
int
MgmtSrvr::repCommand(Uint32* repReqId, Uint32 request, bool waitCompleted)
{
- bool next;
- NodeId nodeId = 0;
-
- while((next = getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_NDB)) == true &&
- theFacade->get_node_alive(nodeId) == false);
-
- if(!next){
- return NO_CONTACT_WITH_DB_NODES;
- }
-
- NdbApiSignal* signal = getSignal();
- if (signal == NULL) {
- return COULD_NOT_ALLOCATE_MEMORY;
- }
-
- GrepReq* req = CAST_PTR(GrepReq, signal->getDataPtrSend());
- signal->set(TestOrd::TraceAPI, GREP, GSN_GREP_REQ, GrepReq::SignalLength);
- req->senderRef = _ownReference;
- req->request = request;
-
- int result;
- if (waitCompleted)
- result = sendRecSignal(nodeId, NO_WAIT, signal, true);
- else
- result = sendRecSignal(nodeId, NO_WAIT, signal, true);
- if (result == -1) {
- return SEND_OR_RECEIVE_FAILED;
- }
-
- /**
- * @todo
- * Maybe add that we should receive a confirmation that the
- * request was received ok.
- * Then we should give the user the correct repReqId.
- */
-
- *repReqId = 4711;
-
+ abort();
return 0;
}
--- 1.31/ndb/src/ndbapi/TransporterFacade.cpp 2005-07-14 18:07:55 +02:00
+++ 1.32/ndb/src/ndbapi/TransporterFacade.cpp 2005-08-18 14:04:50 +02:00
@@ -35,6 +35,7 @@
#include <ndb_version.h>
#include <SignalLoggerManager.hpp>
#include <kernel/ndb_limits.h>
+#include <signaldata/AlterTable.hpp>
//#define REPORT_TRANSPORTER
//#define API_TRACE;
@@ -305,6 +306,17 @@
theFacade->theArbitMgr->doStop(theData);
break;
+ case GSN_ALTER_TABLE_REP:
+ {
+ const AlterTableRep* rep = (const AlterTableRep*)theData;
+ theFacade->m_globalDictCache.lock();
+ theFacade->m_globalDictCache.
+ alter_table_rep((const char*)ptr[0].p,
+ rep->tableId,
+ rep->tableVersion,
+ rep->changeType == AlterTableRep::CT_ALTERED);
+ theFacade->m_globalDictCache.unlock();
+ }
default:
break;
--- 1.169/sql/ha_ndbcluster.cc 2005-08-10 09:52:50 +02:00
+++ 1.170/sql/ha_ndbcluster.cc 2005-08-18 14:04:50 +02:00
@@ -3258,7 +3258,10 @@
DBUG_PRINT("info", ("Table schema version: %d",
tab->getObjectVersion()));
// Check if thread has stale local cache
- if (tab->getObjectStatus() == NdbDictionary::Object::Invalid)
+ // New transaction must not use old tables... (trans != 0)
+ // Running might...
+ if ((trans && tab->getObjectStatus() != NdbDictionary::Object::Retrieved)
+ || tab->getObjectStatus() == NdbDictionary::Object::Invalid)
{
invalidate_dictionary_cache(FALSE);
if (!(tab= dict->getTable(m_tabname, &tab_info)))
| Thread |
|---|
| • bk commit into 4.1 tree (jonas:1.2386) | jonas | 18 Aug |
