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

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

into  bodhi.local:/opt/local/work/mysql-4.1-runtime

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

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

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

into  bodhi.local:/opt/local/work/mysql-4.1-runtime


sql/item_func.cc:
  Auto merged

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

  Reverted change for bug#13859, applied smaller patch from Marko


innobase/buf/buf0buf.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/dict/dict0dict.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/fil/fil0fil.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/ha/ha0ha.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/ha/hash0hash.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/include/hash0hash.h:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/lock/lock0lock.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/log/log0recv.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/thr/thr0loc.c:
  Reverted change for bug#13859, applied smaller patch from Marko

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


VC++Files/mysql.dsw:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/libmysqld/libmysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqldmax.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0

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


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Null merge, because "--platform" is already a real argument in 4.1
support-files/MySQL-shared-compat.spec.sh:
  Null merge, because the 4.1 version already uses two digits
  for "version40" and "version41".

into  olga.mysql.com:/home/igor/mysql-4.1-opt

2nd version
During tmp tables cleanup we get the handler for temporary table
and delete table using handler method.


sql/mysql_priv.h:
  added function prototype
sql/mysqld.cc:
  added call of mysql_rm_tmp_tables() function
sql/sql_base.cc:
  mysql_rm_tmp_tables()
  -removed from table_cache_init
  -During tmp tables cleanup we get the handler for temporary table
   and delete table using handler method. 
   it allows to remove orphan records from data dictionary(InnoDB)

In the method Item_field::fix_fields we try to resolve the name of
the field against the names of the aliases that occur in the select
list. This is done by a call of the function find_item_in_list.
When this function finds several occurrences of the field name
it sends an error message to the error queue and returns 0.
Yet the code did not take into account that find_item_in_list
could return 0 and tried to dereference the returned value.


mysql-test/r/order_by.result:
  Added a test case for bug #25427.
mysql-test/t/order_by.test:
  Added a test case for bug #25427.
sql/item.cc:
  Fixed bug #25427.
  In the method Item_field::fix_fields we try to resolve the name of
  the field against the names of the aliases that occur in the select
  list. This is done by a call of the function find_item_in_list.
  When this function finds several occurrences of the field name 
  it sends an error message to the error queue and returns 0.
  Yet the code did not take into account that find_item_in_list
  could return 0 and tried to dereference the returned value.

no future build of it will include Berkeley DB:
Remove it from the Windows VC++ project files.

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-build

into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

mysys/mf_iocache.c:
  Exclude
mysys/my_seek.c:
  Exclude

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443


heap/hp_block.c:
  Auto merged
sql/item_func.cc:
  Auto merged
heap/hp_write.c:
  Manual merge.

           server

The problem was that when memory was exhausted HEAP engine could crash
(GROUP BY uses HEAP TABLE).  Alternatively, if SET was used, it could
report an error "You may only use constant expressions with SET" instead
of "Out of memory (Needed NNNNNN bytes)".

The solution is:
 - pass MY_WME to (some) calls to my_malloc() to get correct message.
 - fix heap_write() so that the first key is skipped during cleanup
   on ENOMEM because it wasn't inserted and doesn't have to be
   deleted.

No test case is provided because we can't test out-of-memory behaviour
in our current test framework.


heap/hp_block.c:
  If allocation fails, write an error message.
heap/hp_write.c:
  On ENOMEM, skip the first key in cleanup, as it wasn't inserted yet.
sql/item_func.cc:
  Add MY_WME so that OOM error will be reported.

- "make_binary_distribution" accepts a dummy "--platform=" argument.

- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.


scripts/make_binary_distribution.sh:
  Newer versions of the release build tools call this with a "--platform=" argument
  which we seem not to need in 4.0, but which makes the tool crash (happened on SCO).
  
  Rather than add another version check into the build tools, just accept a "--platform="
  argument and ignore it, just give a message.
support-files/MySQL-shared-compat.spec.sh:
  The current version of "Do-shared-compat" needs two digits to identify the release families
  (to differ between 4.0 and 4.1), so the variable "version4" must get renamed to "version40".

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

  Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture


scripts/make_binary_distribution.sh:
  Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
support-files/mysql.spec.sh:
  Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture

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

  Patch from Alfredo for TARGET_FAT_BINARY


include/my_global.h:
  Patch from Alfredo for TARGET_FAT_BINARY

into  mysql.com:/d2/hf/opt/my41-opt

libmysqld/lib_sql.cc:
  reading warning count added

libmysqld/lib_sql.cc:
  error message moved to 'stmt'
mysql-test/t/distinct.test:
  temporary disabled in embedded server
mysql-test/t/mysqladmin.test:
  disabled in embedded server
sql/sql_prepare.cc:
  superfluous #ifndef removed

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

  Renamed hash_create() not to clash with imap using embedded server (bug#13859)


innobase/buf/buf0buf.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/dict/dict0dict.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/fil/fil0fil.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/ha/ha0ha.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/ha/hash0hash.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/include/hash0hash.h:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/lock/lock0lock.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/log/log0recv.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/thr/thr0loc.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  Don't build server when configured --without-server (bug#23973)


configure.in:
  Don't build server when configured --without-server (bug#23973)

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

  Portable handling of "echo" without newline (bug#24605)
check-cpu:
  In developer script safe to use "printf", not "echo -n"


BUILD/check-cpu:
  In developer script safe to use "printf", not "echo -n"
scripts/mysql_secure_installation.sh:
  Portable handling of "echo" without newline (bug#24605)

into  mysql.com:/d2/hf/common/my41-common


sql/item_func.cc:
  Auto merged

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

Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.

Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.


myisam/mi_range.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized a variable to get rid of a compiler warning.
myisam/mi_test1.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Declared an parameter unused to get rid of warnings.
myisam/mi_write.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized a variable to get rid of a compiler warning.
  Casted arguments to DBUG_PRINT to match them with their
  format string conversion specification.
myisam/rt_split.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized variables to get rid of compiler warnings.

Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.

Fixed DBUG_PRINT format specifiactions.


myisam/mi_packrec.c:
  Bug#25208 - Warnings in mi_packrec.c
  Fixed DBUG_PRINT format specifiactions.