include/my_pthread.h:
  fix merge conflict

official binary builds for Linux that are built against a static glibc with
a 128k thread stack size limit can be compiled with a default that doesn't
result in a harmless (but oft-misunderstood) warning message. (Bug #6226)


include/my_pthread.h:
  Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=...

  On Windows my_sleep() always gave a zero microsecond sleep


mysys/my_sleep.c:
  On Windows my_sleep() always gave a zero microsecond sleep

fixed bug

mysql-test/mysql_test_run_new.c:
  SCCS merged

_stricmp was replaved on sting_compare_func
added breakes for windows


mysql-test/mysql_test_run_new.c:
  _stricmp was replaved on sting_compare_func
  added breakes for windows

  Link mysql_test_run_new as console application
my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysqldump.dsp:
  Added mysys.lib for linking mysqldump


VC++Files/client/mysqldump.dsp:
  Added mysys.lib for linking mysqldump
VC++Files/client/mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysql-test/mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysql-test/my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Link mysql_test_run_new as console application

into mysql.com:/home/mydev/mysql-4.1-4100

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

sql/set_var.cc:
  merge

  Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.


sql-common/client.c:
  Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.

into mysql.com:/home/mydev/mysql-4.1-4100

sql/set_var.cc:
  Make query_cache_wlock_invalidate visible in SHOW VARIABLES

for port and/or pid-file parameters. (Bug #5878)


scripts/mysqld_safe.sh:
  Change 'ps xa' to 'ps xaww' so whole command-line is examined

sql-bench/crash-me.sh:
  Fix typo

into mysql.com:/space/my/mysql-4.1-build


Build-tools/Bootstrap:
  Auto merged

  ChangeLog, too (to be more exact when tagging a release that's based on a
  merge ChangeSet)


Build-tools/Bootstrap:
  - include merge ChangeSets into the ChangeLog, too (to be more exact when
    tagging a release that's based on a merge ChangeSet)

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


ndb/include/ndb_global.h.in:
  Auto merged

ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in

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

ndb/include/ndb_types.h:
  redo UintPtr handling

  Added missing stop_reap_all() if returns early from function
mysql-test-run.pl:
  Improved output from --script-debug
  Initial Cygwin support
  Improved mysqld process termination


mysql-test/mysql-test-run.pl:
  Improved output from --script-debug
  Initial Cygwin support
  Improved mysqld process termination
mysql-test/lib/mtr_process.pl:
  Added missing stop_reap_all() if returns early from function

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into mysql.com:/home/wax/mysql/mysql-4.1test2

added sort of file names for all OS


BitKeeper/etc/ignore:
  Added mysql-test/mysql-test-run.log mysql-test/r/alter_table.err mysql-test/r/archive.err mysql-test/r/bdb-alter-table-1.err mysql-test/r/bdb-alter-table-2.err mysql-test/r/bdb-crash.err mysql-test/r/bdb-deadlock.err mysql-test/r/bdb.err mysql-test/r/bdb_cache.err mysql-test/r/client_test.err mysql-test/r/csv.err mysql-test/r/ctype_ucs.err mysql-test/r/derived.err mysql-test/r/exampledb.err mysql-test/r/func_encrypt.err mysql-test/r/isam.err mysql-test/r/lowercase_table2.err mysql-test/r/multi_update.err mysql-test/r/mysql_protocols.err mysql-test/r/mysqlbinlog.err mysql-test/r/mysqlbinlog2.err mysql-test/r/mysqldump.err mysql-test/r/mysqltest.err mysql-test/r/ndb_alter_table.err mysql-test/r/ndb_autodiscover.err mysql-test/r/ndb_autodiscover2.err mysql-test/r/ndb_basic.err mysql-test/r/ndb_blob.err mysql-test/r/ndb_cache.err mysql-test/r/ndb_charset.err mysql-test/r/ndb_index.err mysql-test/r/ndb_index_ordered.err mysql-test/r/ndb_index_unique.err mysql-test/r/ndb_insert.err mysql-test/r/ndb_limit.err m
mysql-test/mysql_test_run_new.c:
  added sort of file names for all OS

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/wax/mysql/mysql-4.1test2

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.7545

myisam/mi_check.c:
  This code should be ifdefed in no HAVE_SPATIAL case

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

  Silence compiler warning.


sql/set_var.cc:
  Silence compiler warning.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Added initial support for multiple test suites
  Added usage information, i.e. --help


mysql-test/mysql-test-run.pl:
  Added initial support for multiple test suites
  Added usage information, i.e. --help

into mysql.com:/home/wax/mysql/mysql-4.1test2

move my_end() after free_used_memory()


client/mysqltest.c:
  move my_end() after free_used_memory()

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1