bk commit into 5.0 tree (gni:1.2247)

[gni]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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-08-15 17:55:44+08:00, gni@dev3-127.(none) +5 -0
  Merge gni@stripped:/home/bk/mysql-5.0-ndb-bj
  into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
  MERGE: 1.2242.1.10

  ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2006-08-15 17:54:10+08:00, gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.102.1.1

  sql/sql_base.cc@stripped, 2006-08-15 17:54:10+08:00, gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.346.1.1

  sql/sql_lex.h@stripped, 2006-08-15 17:54:10+08:00, gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.224.1.1

  sql/sql_view.cc@stripped, 2006-08-15 17:55:39+08:00, gni@dev3-127.(none) +44 -17
    MERGE: 1.91.1.3

  sql/table.cc@stripped, 2006-08-15 17:54:10+08:00, gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.230.1.1

# 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:	gni
# Host:	dev3-127.(none)
# Root:	/mnt/mysql/home/ngb/mysql-5.0-ndb-bj/RESYNC

--- 1.104/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-08-15 17:56:50 +08:00
+++ 1.105/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-08-15 17:56:50 +08:00
@@ -449,7 +449,10 @@
     // read config locally
     _config= readConfig();
     if (_config == 0) {
-      ndbout << "Unable to read config file" << endl;
+      if (config_filename != NULL)
+        ndbout << "Invalid configuration file: " << config_filename <<
endl;
+      else
+        ndbout << "Invalid configuration file" << endl;
       exit(-1);
     }
   }