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

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

  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

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

  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

  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

  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.

into  chilla.local:/home/mydev/mysql-4.1-axmrg

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

    The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".


support-files/mysql.spec.sh:
  The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".

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

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


mysql-test/r/alter_table.result:
  SCCS merged
mysql-test/t/alter_table.test:
  SCCS merged

and no WHERE condition were applied for any subquery without tables.



mysql-test/r/subselect.result:
  Added a test case for bug #24670.
mysql-test/t/subselect.test:
  Added a test case for bug #24670.
sql/item_subselect.cc:
  Fixed bug #24670: optimizations that are legal only for subqueries without tables
  and no WHERE condition were applied for any subquery without tables.
  
  Removed an assertion that caused an abort for subqueries without tables and no 
  WHERE condition. 
  Blocked substitution of a single-row subquery without tables for the constant 
  row from its select list when the subquery contained a WHERE condition.
  This optimization is valid only for subquries without tables with no conditions.
  Any subquery without tables with WHERE clause returns NULL if the WHERE condition
  is FALSE. Erroneously it was always considered as non-nullable that could trigger 
  another optimization concerning IS NULL predicates which is applicable only for 
  non-nullable expressions and ultimately led to a wrong result returned by the outer
  query.
  Added a proper implementation of the virtual method may_be_null for class 
  subselect_single_select_engine.
sql/item_subselect.h:
  Fixed bug #24670: optimizations that are legal only for subqueries without tables
  and no WHERE condition were applied for any subquery without tables.
  Made method may_by_null for class subselect_engine vvirtual.

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

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

into  chilla.local:/home/mydev/mysql-4.1-axmrg

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


libmysqld/lib_sql.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

mysql-test/lib/mtr_unique.pl:
  do not autorelease build ids when a child dies

            table

ROW_FORMAT option is lost during CREATE/DROP INDEX.

This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.


mysql-test/r/alter_table.result:
  A test case for bug#23404.
mysql-test/t/alter_table.test:
  A test case for bug#23404.
sql/sql_parse.cc:
  CREATE/DROP INDEX must not change ROW_FORMAT. Setting create_info.row_type
  to ROW_TYPE_NOT_USED informs mysql_alter_table that ROW_FORMAT was not
  used during alteration, and thus must be retained.