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
1.2476 07/03/09 18:43:48 tomas@stripped +5 -0
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-6.1_2
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-merge
configure.in
1.439 07/03/09 18:43:36 tomas@stripped +0 -2
manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
1.50 07/03/09 18:40:16 tomas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
1.121 07/03/09 18:40:15 tomas@stripped +0 -0
Auto merged
cluster_change_hist.txt
1.13 07/03/09 18:40:15 tomas@stripped +0 -0
Auto merged
BitKeeper/etc/ignore
1.281 07/03/09 18:39:25 tomas@stripped +0 -1
auto-union
# 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: tomas
# Host: poseidon.mysql.com
# Root: /home/tomas/mysql-5.1-telco-merge/RESYNC
--- 1.12/cluster_change_hist.txt 2007-03-07 14:34:26 +07:00
+++ 1.13/cluster_change_hist.txt 2007-03-09 18:40:15 +07:00
@@ -2,11 +2,20 @@
mysql-5.1.15-ndb-6.1.X
==================================================
-mysql-5.1.15-ndb-6.1.4 (limited test release)
+mysql-5.1.15-ndb-6.1.5 (not released yet)
+ Bug #25743 - If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed
Bug #26899 - ndb_restore cannot restore selected tables and databases
Bug #26900 - ndb_restore printout option does not give structured data
Bug #26720 - Infinite loop on unknown signal in logging function
+
+ * ndb_apply_status schema change
+ * ndb_restore options for printing to file
+
+ Note: since ndb_apply_status schema change this version is not backwards compatible
+
+mysql-5.1.15-ndb-6.1.4 (limited test release)
+
Bug #26741 - ndb_restore with only print_data seg faults
Bug #26739 - ndb_restore segfault on some 64-bit architectures
Bug #26663 - cluster have issues with api nodeids > 63
--- 1.120/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2007-03-09 01:08:50 +07:00
+++ 1.121/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2007-03-09 18:40:15 +07:00
@@ -3758,9 +3758,7 @@ Dbdict::execCREATE_TABLE_REQ(Signal* sig
break;
}
- if(getNodeState().getSingleUserMode() &&
- (refToNode(signal->getSendersBlockRef()) !=
- getNodeState().getSingleUserApi()))
+ if (checkSingleUserMode(signal->getSendersBlockRef()))
{
jam();
parseRecord.errorCode = CreateTableRef::SingleUser;
@@ -3959,9 +3957,7 @@ Dbdict::execALTER_TABLE_REQ(Signal* sign
return;
}
- if(getNodeState().getSingleUserMode() &&
- (refToNode(signal->getSendersBlockRef()) !=
- getNodeState().getSingleUserApi()))
+ if (checkSingleUserMode(signal->getSendersBlockRef()))
{
jam();
alterTableRef(signal, req, AlterTableRef::SingleUser);
@@ -6560,9 +6556,7 @@ Dbdict::execDROP_TABLE_REQ(Signal* signa
return;
}
- if(getNodeState().getSingleUserMode() &&
- (refToNode(signal->getSendersBlockRef()) !=
- getNodeState().getSingleUserApi()))
+ if (checkSingleUserMode(signal->getSendersBlockRef()))
{
jam();
dropTableRef(signal, req, DropTableRef::SingleUser);
@@ -7776,9 +7770,7 @@ Dbdict::execCREATE_INDX_REQ(Signal* sign
jam();
tmperr = CreateIndxRef::Busy;
}
- else if(getNodeState().getSingleUserMode() &&
- (refToNode(senderRef) !=
- getNodeState().getSingleUserApi()))
+ else if (checkSingleUserMode(senderRef))
{
jam();
tmperr = CreateIndxRef::SingleUser;
@@ -8426,9 +8418,7 @@ Dbdict::execDROP_INDX_REQ(Signal* signal
jam();
tmperr = DropIndxRef::Busy;
}
- else if(getNodeState().getSingleUserMode() &&
- (refToNode(senderRef) !=
- getNodeState().getSingleUserApi()))
+ else if (checkSingleUserMode(senderRef))
{
jam();
tmperr = DropIndxRef::SingleUser;
@@ -16346,5 +16336,20 @@ Dbdict::send_drop_fg(Signal* signal, Sch
sendSignal(ref, GSN_DROP_FILEGROUP_REQ, signal,
DropFilegroupImplReq::SignalLength, JBB);
+}
+
+/*
+ return 1 if all of the below is true
+ a) node in single user mode
+ b) senderRef is not a db node
+ c) senderRef nodeid is not the singleUserApi
+*/
+int Dbdict::checkSingleUserMode(Uint32 senderRef)
+{
+ Uint32 nodeId = refToNode(senderRef);
+ return
+ getNodeState().getSingleUserMode() &&
+ (getNodeInfo(nodeId).m_type != NodeInfo::DB) &&
+ (nodeId != getNodeState().getSingleUserApi());
}
--- 1.49/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2007-03-07 00:36:39 +07:00
+++ 1.50/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2007-03-09 18:40:16 +07:00
@@ -2649,6 +2649,8 @@ public:
void send_drop_fg(Signal*, SchemaOp*, DropFilegroupImplReq::RequestInfo);
void drop_undofile_prepare_start(Signal* signal, SchemaOp*);
+
+ int checkSingleUserMode(Uint32 senderRef);
};
inline bool
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2476) | tomas | 9 Mar |
