into  mysql.com:/home/kent/bk/build/mysql-4.1-build

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M41/push-4.1

into  mysql.com:/data0/mysqldev/my/build-200802282059-4.1.24/mysql-4.1-release

into  trift2.:/MySQL/M41/push-4.1

into  kaamos.(none):/data/src/opt/mysql-4.1-opt

  - Aligned copyright headers and text with 5.0
  - Don't strip binaries on SuSE 9
  - Formatting alignment with spec file in 5.0
  - Run full test on "normal" binary, and less on "Max"
  - Let test runs on "Max" identify the runs with "max" and "max+ps"

added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of mysql data home directory in
DATA DIRECTORY & INDEX DIRECTORY is disallowed.

  Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message

into  kaamos.(none):/data/src/opt/mysql-4.1-opt

Field data for a query was stored to the stmt->alloc that is emptied
with mysql_stmt_close statement only. That means a lot of memory can
be occupied without a reason if used doesn't call mysql_stmt_close often.

into  mysql.com:/home/kent/bk/build/mysql-4.1-build

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build

into  trift2.:/MySQL/M41/push-4.1

	running queries

Bug#33976: buffer overflow of variable time_buff in function com_go()

An internal buffer was too short.  Overextending could smash the 
stack on some architectures and cause SEGVs.  This is not a problem
that could be exploited to run arbitrary code.

To fix, I expanded one buffer to cover all the size that could be
written to (we know the abolute max).

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

into  trift2.:/MySQL/M41/push-4.1

into  mysql.com:/home/kent/bk/build/mysql-4.1-build

  Minor cleanup, removed semicolons not needed

Fix the code to get the "libgcc" file name so that the failure of Intel's ICC
to provide this information does not cause any problems.

This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler

into  mysql.com:/misc/mysql/31752_/41-31752_

fix test program

into  mysql.com:/misc/mysql/31752_/41-31752_

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build

post-fixes: prevent semi-related overflow, additional comments

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

into  mysql.com:/misc/mysql/32707/41-32707

into  mysql.com:/home/hf/work/mrg/my41-mrg

into  four.local.lan:/work/trees/mysql-4.1-build-src-clean

into  mysql.com:/home/hf/work/mrg/my41-mrg

   Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
Note:
  This bug does not occur in MySQL 5.0 and up, because
  ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
  The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
  which is set by mysql-test-run.pl.
  mysql-test-run.pl in 4.1 does not set this variable.
  There are two alternatives:
  1) Backport the 5.0 fix for this test including modifications
     to mysql-test-run.pl and mysql-test-run-shell.
     This is a not acceptable impact on an old MySQL version.
  2) Fix the problem different than in 5.0 like in the current
     ChangeSet + do not apply these changes when upmerging to 5.0

  Added 64 bit Mac OS X hard coded settings, for universal binaries