bk commit into 5.1 tree (lzhou:1.2420)

[lzhou]

Below is the list of changes that have just been committed into a local
5.1 repository of zhl. When zhl 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, 2007-02-05 15:44:59+00:00, lzhou@dev3-63.(none) +1 -0
  Merge lzhou@stripped:/home/bk/mysql-5.1-new-ndb-bj
  into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug21296-5.1.12
  MERGE: 1.2298.3.1

  storage/ndb/src/kernel/error/ErrorReporter.cpp@stripped, 2007-02-05 15:44:42+00:00, lzhou@dev3-63.(none) +0 -0
    Auto merged
    MERGE: 1.15.1.2

# 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:	lzhou
# Host:	dev3-63.(none)
# Root:	/home/zhl/mysql/mysql-5.1/bug21296-5.1.12/RESYNC

--- 1.16/storage/ndb/src/kernel/error/ErrorReporter.cpp	2007-02-05 15:45:16 +00:00
+++ 1.17/storage/ndb/src/kernel/error/ErrorReporter.cpp	2007-02-05 15:45:16 +00:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -186,6 +185,7 @@
   childReportError(ec);
 
   NdbShutdown(s_errorHandlerShutdownType);
+  exit(1);                                      // Deadcode
 }
 
 void