From: Date: October 23 2006 9:48am Subject: bk commit into 5.1 tree (jonas:1.2331) BUG#21052 List-Archive: http://lists.mysql.com/commits/14153 X-Bug: 21052 Message-Id: <20061023074841.409F35A3608@perch.ndb.mysql.com> Below is the list of changes that have just been committed into a local 5.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@stripped, 2006-10-23 09:48:36+02:00, jonas@stripped +1 -0 5.1.12 - release clone ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes storage/ndb/src/mgmsrv/Services.cpp@stripped, 2006-10-23 09:48:34+02:00, jonas@stripped +1 -7 5.1.12 - release clone ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes # 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: perch.ndb.mysql.com # Root: /home/jonas/src/mysql-5.1-release --- 1.75/storage/ndb/src/mgmsrv/Services.cpp 2006-10-23 09:48:41 +02:00 +++ 1.76/storage/ndb/src/mgmsrv/Services.cpp 2006-10-23 09:48:41 +02:00 @@ -1368,14 +1368,8 @@ 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 copy; m_clients.lock(); for(i = m_clients.size() - 1; i >= 0; i--)