Merge mysqldev@production.mysql.com:my/mysql-5.0-release

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


client/client_priv.h:
  Auto merged

ndb/tools/Makefile.am

@@ -33,7 +33,7 @@ ndb_restore_SOURCES = restore/restore_main.cpp \
                       restore/Restore.cpp \
                       ../test/src/NDBT_ResultRow.cpp $(tools_common_sources)
 
-ndb_config_SOURCES = config.cpp \
+ndb_config_SOURCES = ndb_config.cpp \
 	../src/mgmsrv/Config.cpp \
 	../src/mgmsrv/ConfigInfo.cpp \
 	../src/mgmsrv/InitConfigFileParser.cpp