to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249)


scripts/mysqld_safe.sh:
  Don't actually verify that datadir exists when
  using relatively-located mysqld -- just assume
  that it does and either let it fail when it
  doesn't, or do the right thing when datadir
  is then set via the command line or my.cnf file.

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.

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