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

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.

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

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

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

Denormalized DOUBLE-s can't be properly handled by old MIPS processors.
So we need to enable specific mode for them so IRIX will do use
software round to handle such numbers. 

Miscalculation in protocol-layer: size buffer correctly so
even really long error messages cannot overflow our buffer.

comment fixed as we truly need const_item to be 1 to mark
constant function

strmake() calls are easy to get wrong. Add checks in extra
debug mode to identify possible exploits.

Remove some dead code.

Remove some off-by-one errors identified with new checks.

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

into  stella.local:/home2/mydev/mysql-4.1-axmrg

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

SPATIAL key is fine actually, but the chk_key() function
mistakenly returns error. It tries to compare checksums
of btree and SPATIAL keys while the checksum for the SPATIAL isn't
calculated (always 0). Same thing with FULLTEXT keys is handled
using full_text_keys counter, so fixed by counting both
SPATIAL and FULLTEXT keys in that counter.

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

into  stella.local:/home2/mydev/mysql-4.1-axmrg