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

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 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

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

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

  Added --ps-protocol and --embedded-server


mysql-test/mysql-test-run.pl:
  Added --ps-protocol and --embedded-server

  Fix a wrong memset in InnoDB Hot Backup code; the bug probably did not affect anything since we do not assume that the header of a log file is filled with zeros before writing the header info there; the bug found by Felix von Leitner


innobase/log/log0recv.c:
  Fix a wrong memset in InnoDB Hot Backup code; the bug probably did not affect anything since we do not assume that the header of a log file is filled with zeros before writing the header info there; the bug found by Felix von Leitner

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

  Fix a little bug in InnoDB: we looked at the physical size of a stored SQL NULL value from a wrong field in the index; this has probably caused no bugs visible to the user, only caused some extra space usage in some rare cases; we may later backport the fix to 4.0


innobase/row/row0upd.c:
  Fix a little bug in InnoDB: we looked at the physical size of a stored SQL NULL value from a wrong field in the index; this has probably caused no bugs visible to the user, only caused some extra space usage in some rare cases; we may later backport the fix to 4.0

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

BUILD/compile-dist:
  - make sure to include NDB cluster in the distribution, too

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


Build-tools/Bootstrap:
  Auto merged

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

Build-tools/Bootstrap:
  - Use BUILD/compile-dist instead of compile-pentium-max
  - some minor cleanups

mysql-test/r/grant2.result:
  new test case
mysql-test/r/variables.result:
  don't fail w/o innodb
mysql-test/t/grant2.test:
  new test case
mysql-test/t/multi_update.test:
  don't fail w/o innodb
mysql-test/t/variables.test:
  don't fail w/o innodb
sql/sql_acl.cc:
  cleanup

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

  "Max" RPM


support-files/mysql.spec.sh:
  - added the "Archive", "CSV" and "Example" storage engines to the Max RPM

entry was released before check. Thus empty it is when
size == no of free
This caused a memory leak which inserted a hard limit of
max 64 unique indexes in the cluster.

correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.


mysql-test/r/ps_2myisam.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_3innodb.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_4heap.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_5merge.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_6bdb.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
mysql-test/r/ps_7ndb.result:
  Updated test result after merging fix for bug #7297 "Two digit year should
  be interpreted correctly even with zero month and day" into 4.1
sql-common/my_time.c:
  Merged fix for bug #7297 "Two digit year should be interpreted correctly
  even with zero month and day" into 4.1
sql/item_timefunc.cc:
  Small fix after merging patch solving bug #7515 "from_unixtime(0) now
  returns NULL instead of the Epoch" into 4.1.

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged