summaryrefslogtreecommitdiff
path: root/storage/ndb
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2006-10-23 09:48:36 +0200
committerjonas@perch.ndb.mysql.com <>2006-10-23 09:48:36 +0200
commitcfd146d9117f055e0dd70a820bc82017c1fc01e3 (patch)
tree073d68cbb34ff30125924b383ec89ea5f1f7e49b /storage/ndb
parent60104e1132a5b382f0bc2fcb66a8a82728ac8eb8 (diff)
downloadmariadb-git-cfd146d9117f055e0dd70a820bc82017c1fc01e3.tar.gz
5.1.12 - release clone
ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
Diffstat (limited to 'storage/ndb')
-rw-r--r--storage/ndb/src/mgmsrv/Services.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/storage/ndb/src/mgmsrv/Services.cpp b/storage/ndb/src/mgmsrv/Services.cpp
index 4a84095aa9f..80dd040eb1b 100644
--- a/storage/ndb/src/mgmsrv/Services.cpp
+++ b/storage/ndb/src/mgmsrv/Services.cpp
@@ -1368,14 +1368,8 @@ Ndb_mgmd_event_service::log(int eventType, const Uint32* theData, NodeId nodeId)
if (ndb_logevent_body[i].index_fn)
val= (*(ndb_logevent_body[i].index_fn))(val);
str.appfmt("%s=%d\n",ndb_logevent_body[i].token, val);
- if(strcmp(ndb_logevent_body[i].token,"error") == 0)
- {
- int m_text_len= strlen(m_text);
- snprintf(m_text+m_text_len, 4 , " - ");
- ndb_error_string(theData[3], m_text+(m_text_len+3), sizeof(m_text)-m_text_len-3);
- }
}
-
+
Vector<NDB_SOCKET_TYPE> copy;
m_clients.lock();
for(i = m_clients.size() - 1; i >= 0; i--)