some other small fixes


ndb/include/mgmcommon/ConfigRetriever.hpp:
  added options to do_connect to contol how connects failures should be treated
ndb/include/mgmcommon/NdbConfig.h:
  method to retrieve datadir path (to user for chdir)
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Added connect thread
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added options to do_connect to contol how connects failures should be treated
ndb/src/common/mgmcommon/NdbConfig.c:
  method to retrieve datadir path (to user for chdir)
ndb/src/kernel/main.cpp:
  ndbd to do chdir
ndb/src/kernel/vm/WatchDog.cpp:
  added my_thread_init for debug
ndb/src/ndbapi/ClusterMgr.cpp:
  added my_thread_init for debug
ndb/src/ndbapi/TransporterFacade.cpp:
  removed call to atexit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added connect thread

into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

added class Ndb_cluster_connection to prepare for making order of starting mysqld and ndbd irrelevant


ndb/src/mgmsrv/Makefile.am:
  changed so that datadir is "." by default so that behaviour is the same as before

into mysql.com:/home/jonas/src/mysql-4.1-ndb


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

1) explicit start/stop timer (instead of perodical reports)
2) scan & range scan reporting

ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#4591
  Wait for not started instead of (! no contact)

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

 - tagged ChangeSet@1.2013 as "mysql-4.1.4"


configure.in:
   - bumped up version number in configure.in to "4.1.5-gamma"

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


cmd-line-utils/libedit/Makefile.am:
  Auto merged
configure.in:
  Auto merged

acinclude.m4:
  added macro to check if dirent.d_namlen is defined
cmd-line-utils/libedit/config.h:
  added define for __attribute__
cmd-line-utils/libedit/readline.c:
  checked STRUCT_DIRENT_HAS_D_NAMLEN instead of
  old enumeration of problem platforms
configure.in:
  added checking if dirent has d_namlen member field

into mysql.com:/home/jonas/src/mysql-4.1-ndb

1) merge join
2) lookups

discarded using of uint in cmd-line-utils/libedit/chared.c
because it's undefined on qnx


cmd-line-utils/libedit/chared.c:
  discarded using of uint because it's undefined on qnx

(non gcc compilers don't understand '-Dx()=' option)


cmd-line-utils/libedit/Makefile.am:
  discarded '-Dx()=' options for compatibility with non-gcc compilers
cmd-line-utils/libedit/config.h:
  added empty definitions of __RCSID(x), __COPYRIGHT(x), 
                            __RENAME(x), _DIAGASSERT(x)
cmd-line-utils/libedit/np/unvis.c:
  added #include "config.h" to define __RCSID(x)
cmd-line-utils/libedit/np/vis.c:
  reinsert #include "config.h" before using of __RCSID(x)

into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames


sql/sql_class.cc:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

ndb/src/ndbapi/NdbOperationInt.cpp:
  Fix so that interpreter is possible together with index scans
ndb/test/ndbapi/Makefile.am:
  New test prog

not variables.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  Auto merged

into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

configure.in:
  Defining "BIG_TABLES" works around a problem with the Sun Forte 
  compiler for Solaris on x86 platforms: improper handling of "long long".
  Error shows up on the "limit_rows_found" variable in test "union".
  Old "BIG_FILES" was a typing error.

Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)


sql/ha_ndbcluster.cc:
  Removed errornous hupp, which made handler commit same transid several times
  (which is checked when running in debug mode)

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  seeror set method for signal handler
ndb/src/kernel/main.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/vm/Emulator.cpp:
  adder error insert for error during shutdown
  + check for error handler invoked by signal handler
ndb/src/kernel/vm/Emulator.hpp:
  enum so signal that Shatdown is invoked by signal handler

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

cleanups
better, charset-dependent, ft_max_len_for_sort value


myisam/ftdefs.h:
  better ft_max_len_for_sort value
myisam/mi_check.c:
  better, charset-dependent, ft_max_len_for_sort value
myisam/myisamchk.c:
  unused value from enum removed
myisam/sort.c:
  cleanup
sql/mysql_priv.h:
  cleanup
sql/mysqld.cc:
  cleanup
sql/sql_acl.cc:
  cleanup
sql/tztime.cc:
  cleanup
strings/ctype-utf8.c:
  bug in my_strnncoll_utf8 (and friends) fixed

  Ascii was written twice


configure.in:
  Ascii was written twice

mysql-test/r/ps.result:
  Testcase for BUG#5242
mysql-test/t/ps.test:
  Testcase for BUG#5242