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

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

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

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

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

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

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

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

into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines

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

max_length parameter for BLOB-returning functions must be big enough
for any possible content. Otherwise the field created for a table
will be too small.

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

  Use proper variable for test.

into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0

  Test case for Bug#30069

into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines

When we insert a record into MYISAM table which is almost 'full',
we first write record data in the free space inside a file, and then
check if we have enough space after the end of the file.
So if we don't have the space, table will left corrupted.
Similar error also happens when we updata MYISAM tables.

Fixed by modifying write_dynamic_record and update_dynamic_record functions
to check for free space before writing parts of a record

in mysql_creata_like_table() we 'downcase' the complete path to the
.frm file. It works fine in standalone case as there usually
we only have './' as a path to the datahome, but doesn't work in
the embedded server where we add the real path there, so if a
directory has uppercase letters in it's name, it won't be found.

Fixed by 'downcasing' only database/table pair.

The "mysql client in mysqld"(which is used by
replication and federated) should use alarms instead of setting
socket timeout value if the rest of the server uses alarm. By
always calling 'my_net_set_write_timeout'
or 'net_set_read_timeout' when changing the timeout value(s), the
selection whether to use alarms or timeouts will be handled by
ifdef's in those two functions.

This is minimal backport of patch for BUG#26664, which was pushed
to 5.0 and up.

Affects 4.1 only.

into  polly.(none):/home/kaa/src/opt/mysql-4.1-opt

variable in where clause.

Problem: the new_item() method of Item_uint used an incorrect
constructor. "new Item_uint(name, max_length)" calls
Item_uint::Item_uint(const char *str_arg, uint length) which assumes the
first argument to be the string representation of the value, not the
item's name. This could result in either a server crash or incorrect
results depending on usage scenarios.

Fixed by using the correct constructor in new_item():
Item_uint::Item_uint(const char *str_arg, longlong i, uint length).