into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


myisam/sort.c:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

in middle of block)


libmysql/libmysql.c:
  Fix syntax error - don't define new variables in the middle of a block.
  
  Also, use size_t instead of uint to avoid unnecessary casting.

CPUs / Intel's ICC compile

The bug is a combination of two problems:

1. IA64/ICC MySQL binaries use glibc's qsort(), not the one in mysys.

2. The order relation implemented by join_tab_cmp() is not transitive,
i.e. it is possible to choose such a, b and c that (a < b) && (b < c)
but (c < a). This implies that result of a sort using the relation
implemented by join_tab_cmp() depends on the order in which
elements are compared, i.e. the result is implementation-specific. Since
choose_plan() uses qsort() to pre-sort the
join tables using join_tab_cmp() as a compare function, the results of
the sorting may vary depending on qsort() implementation.

It is neither possible nor important to implement a better ordering
algorithm in join_tab_cmp(). Therefore the only way to fix it is to
force our own qsort() to be used by renaming it to my_qsort(), so we don't depend
on linker to decide that.

This patch also "fixes" bug #20530: qsort redefinition violates the
standard.


include/my_sys.h:
  Renamed qsort() and qsort2() to my_qsort() and my_qsort2(). Since
  previously we relied on stdlib.h to provide a declaration for qsort(), a
  separate declaration for my_qsort() is now required.
libmysql/Makefile.shared:
  Added mf_qsort.c to libmysql, since my_lib.c now uses my_qsort() instead of qsort().
myisam/ft_boolean_search.c:
  Replaced qsort2() with my_qsort2().
myisam/ft_nlq_search.c:
  Replaced qsort2() with my_qsort2().
myisam/myisampack.c:
  Replaced qsort() with my_qsort().
myisam/sort.c:
  Replaced qsort2() with my_qsort2().
mysys/mf_keycache.c:
  Replaced qsort() with my_qsort().
mysys/mf_qsort.c:
  Renamed qsort() to my_qsort() and qsort2() to my_qsort2().
mysys/mf_sort.c:
  Replaced qsort2() with my_qsort2().
mysys/my_lib.c:
  Replaced qsort() with my_qsort().
mysys/queues.c:
  Replaced qsort2() with my_qsort2().
sql/item_cmpfunc.cc:
  Replaced qsort2() with my_qsort2().
sql/item_cmpfunc.h:
  Replaced qsort2() with my_qsort2().
sql/opt_range.cc:
  Replaced qsort() with my_qsort().
sql/records.cc:
  Replaced qsort() with my_qsort().
sql/sql_acl.cc:
  Replaced qsort() with my_qsort().
sql/sql_array.h:
  Replaced qsort() with my_qsort().
sql/sql_help.cc:
  Replaced qsort() with my_qsort().
sql/sql_select.cc:
  Replaced qsort() with my_qsort().
sql/examples/ha_tina.cc:
  Replaced qsort() with my_qsort().
sql/sql_table.cc:
  Replaced qsort() with my_qsort().

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

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

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged
mysql-test/r/type_float.result:
  Manual merge
mysql-test/t/type_float.test:
  Manual merge

into  mysql.com:/home/ram/work/b31154/b31154.5.0

into  mysql.com:/home/ram/work/b31154/b31154.5.0

into  mysql.com:/home/ram/work/b30885/b30885.5.0

into  solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint

BitKeeper/deleted/.del-README.debian:
  Delete: support-files/debian/README.debian
BitKeeper/deleted/.del-changelog~8457b43736642c:
  Delete: support-files/debian/changelog
BitKeeper/deleted/.del-control:
  Delete: support-files/debian/control
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Delete: support-files/debian/copyright
BitKeeper/deleted/.del-gomi:
  Delete: support-files/debian/gomi
BitKeeper/deleted/.del-libmysqlclient10.dirs:
  Delete: support-files/debian/libmysqlclient10.dirs
BitKeeper/deleted/.del-libmysqlclient10.postinst:
  Delete: support-files/debian/libmysqlclient10.postinst
BitKeeper/deleted/.del-libmysqlclient9.dirs:
  Delete: support-files/debian/libmysqlclient9.dirs
BitKeeper/deleted/.del-libmysqlclient9.postinst:
  Delete: support-files/debian/libmysqlclient9.postinst
BitKeeper/deleted/.del-move:
  Delete: support-files/debian/move
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Delete: support-files/debian/my.cnf
BitKeeper/deleted/.del-mysql-bench.dirs:
  Delete: support-files/debian/mysql-bench.dirs
BitKeeper/deleted/.del-aa:
  Delete: support-files/debian/patches/aa
BitKeeper/deleted/.del-mysql-client.dirs:
  Delete: support-files/debian/mysql-client.dirs
BitKeeper/deleted/.del-mysql-dev.dirs:
  Delete: support-files/debian/mysql-dev.dirs
BitKeeper/deleted/.del-mysql-doc.dirs:
  Delete: support-files/debian/mysql-doc.dirs
BitKeeper/deleted/.del-mysql-max-debug.dirs:
  Delete: support-files/debian/mysql-max-debug.dirs
BitKeeper/deleted/.del-mysql-max-debug.postinst:
  Delete: support-files/debian/mysql-max-debug.postinst
BitKeeper/deleted/.del-mysql-max-debug.postrm:
  Delete: support-files/debian/mysql-max-debug.postrm
BitKeeper/deleted/.del-mysql-max-shared.dirs:
  Delete: support-files/debian/mysql-max-shared.dirs
BitKeeper/deleted/.del-mysql-max-shared.postinst:
  Delete: support-files/debian/mysql-max-shared.postinst
BitKeeper/deleted/.del-mysql-max-shared.postrm:
  Delete: support-files/debian/mysql-max-shared.postrm
BitKeeper/deleted/.del-mysql-max.dirs:
  Delete: support-files/debian/mysql-max.dirs
BitKeeper/deleted/.del-mysql-max.postinst:
  Delete: support-files/debian/mysql-max.postinst
BitKeeper/deleted/.del-mysql-max.postrm:
  Delete: support-files/debian/mysql-max.postrm
BitKeeper/deleted/.del-mysql-server-debug.dirs:
  Delete: support-files/debian/mysql-server-debug.dirs
BitKeeper/deleted/.del-mysql-server-debug.postinst:
  Delete: support-files/debian/mysql-server-debug.postinst
BitKeeper/deleted/.del-mysql-server-debug.postrm:
  Delete: support-files/debian/mysql-server-debug.postrm
BitKeeper/deleted/.del-mysql-server-shared.dirs:
  Delete: support-files/debian/mysql-server-shared.dirs
BitKeeper/deleted/.del-mysql-server-shared.postinst:
  Delete: support-files/debian/mysql-server-shared.postinst
BitKeeper/deleted/.del-mysql-server-shared.postrm:
  Delete: support-files/debian/mysql-server-shared.postrm
BitKeeper/deleted/.del-mysql-server.conffiles:
  Delete: support-files/debian/mysql-server.conffiles
BitKeeper/deleted/.del-mysql-server.dirs:
  Delete: support-files/debian/mysql-server.dirs
BitKeeper/deleted/.del-mysql-server.postinst:
  Delete: support-files/debian/mysql-server.postinst
BitKeeper/deleted/.del-mysql-server.postrm:
  Delete: support-files/debian/mysql-server.postrm
BitKeeper/deleted/.del-mysql-server.prerm:
  Delete: support-files/debian/mysql-server.prerm
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Delete: support-files/debian/rules
BitKeeper/deleted/.del-shlibs:
  Delete: support-files/debian/shlibs
BitKeeper/deleted/.del-ab:
  Delete: support-files/debian/patches/ab
BitKeeper/deleted/.del-ac:
  Delete: support-files/debian/patches/ac
BitKeeper/deleted/.del-ad:
  Delete: support-files/debian/patches/ad
BitKeeper/deleted/.del-ae:
  Delete: support-files/debian/patches/ae
BitKeeper/deleted/.del-az:
  Delete: support-files/debian/patches/az
BitKeeper/deleted/.del-ta:
  Delete: support-files/debian/patches/ta
BitKeeper/deleted/.del-tb:
  Delete: support-files/debian/patches/tb

into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

(compiler issue ?)

Problem:

Improper compile-time flags on AIX prevented use of files > 2 GB. This
resulted in Max_data_length being truncated to 2 GB by MyISAM code.

Solution:

Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.

 Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
automatically defined by including standards.h, we also need a
workaround to avoid this conflict.


config/ac-macros/large_file.m4:
  Reverted large-file changes from the fix for bug10776. We need to define
  _LARGE_FILES on AIX to have support for files > 2 GB.
include/my_global.h:
  _LARGE_FILE_API is defined in standards.h that is automatically included
  by at least some C++ compilers on AIX. Since it is also incompatible
  with _LARGE_FILES which is required for POSIX IO calls to be
  largefile-safe, the only workaround is to explicitely #undef
  _LARGE_FILE_API.

into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951

makedate() will fold years below 100 into the 1970-2069 range. CS removes code
that also wrongly folded years between 100 and 200 into that range, which should
be left unchanged. Backport from 5.1.


mysql-test/r/func_sapdb.result:
  Show that makedate() works correctly for 100 <= year < 200.
mysql-test/t/func_sapdb.test:
  Show that makedate() works correctly for 100 <= year < 200.
sql-common/my_time.c:
  Remove unnecessary date magic. Syncs behaviour with 5.1+
  and manual.

into  sin.intern.azundris.com:/home/tnurnberg/30821/50-30821


sql/mysqld.cc:
  Auto merged

Options to mysqld were not processed correctly because switch statement
was missing some "break"s. CS adds them.

No test case; would require .opt file and server restart. Manually tested.


sql/mysqld.cc:
  Add missing "break"s to switch() in mysqld to fix option processing.

BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474:
  Delete: debian/Makefile.am
BitKeeper/deleted/.del-README.Maintainer:
  Delete: debian/README.Maintainer
BitKeeper/deleted/.del-changelog:
  Delete: debian/changelog
BitKeeper/deleted/.del-compat:
  Delete: debian/compat
BitKeeper/deleted/.del-control.in:
  Delete: debian/control.in
BitKeeper/deleted/.del-copyright.more:
  Delete: debian/copyright.more
BitKeeper/deleted/.del-copyright:
  Delete: debian/copyright
BitKeeper/deleted/.del-defs.mk.in:
  Delete: debian/defs.mk.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in:
  Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in:
  Delete: debian/libmysqlclientSLIB-dev.dirs.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in:
  Delete: debian/libmysqlclientSLIB-dev.docs.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in:
  Delete: debian/libmysqlclientSLIB-dev.examples.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
  Delete: debian/libmysqlclientSLIB-dev.files.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in:
  Delete: debian/libmysqlclientSLIB-dev.links.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in:
  Delete: debian/libmysqlclientSLIBoff.README.Debian.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in:
  Delete: debian/libmysqlclientSLIBoff.dirs.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in:
  Delete: debian/libmysqlclientSLIBoff.docs.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in:
  Delete: debian/libmysqlclientSLIBoff.files.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in:
  Delete: debian/libmysqlclientSLIBoff.postinst.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in:
  Delete: debian/libndbclientNLIB-dev.dirs.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in:
  Delete: debian/libndbclientNLIB-dev.files.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in:
  Delete: debian/libndbclientNLIB-dev.links.in
BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in:
  Delete: debian/libndbclientNLIB.README.Debian.in
BitKeeper/deleted/.del-libndbclientNLIB.dirs.in:
  Delete: debian/libndbclientNLIB.dirs.in
BitKeeper/deleted/.del-libndbclientNLIB.files.in:
  Delete: debian/libndbclientNLIB.files.in
BitKeeper/deleted/.del-libndbclientNLIB.postinst.in:
  Delete: debian/libndbclientNLIB.postinst.in
BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in:
  Delete: debian/mysql-client-BASE.NEWS.in
BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in:
  Delete: debian/mysql-client-BASE.README.Debian.in
BitKeeper/deleted/.del-mysql-client-BASE.dirs.in:
  Delete: debian/mysql-client-BASE.dirs.in
BitKeeper/deleted/.del-mysql-client-BASE.docs.in:
  Delete: debian/mysql-client-BASE.docs.in
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
  Delete: debian/mysql-client-BASE.files.in
BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in:
  Delete: debian/mysql-client-BASE.lintian-overrides.in
BitKeeper/deleted/.del-mysql-common.README.Debian.in:
  Delete: debian/mysql-common.README.Debian.in
BitKeeper/deleted/.del-mysql-common.dirs.in:
  Delete: debian/mysql-common.dirs.in
BitKeeper/deleted/.del-mysql-common.files.in:
  Delete: debian/mysql-common.files.in
BitKeeper/deleted/.del-mysql-common.postrm.in:
  Delete: debian/mysql-common.postrm.in
BitKeeper/deleted/.del-mysql-common.preinst.in:
  Delete: debian/mysql-common.preinst.in
BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in:
  Delete: debian/mysql-extra-BASE.dirs.in
BitKeeper/deleted/.del-mysql-extra-BASE.files.in:
  Delete: debian/mysql-extra-BASE.files.in
BitKeeper/deleted/.del-mysql-management-BASE.dirs.in:
  Delete: debian/mysql-management-BASE.dirs.in
BitKeeper/deleted/.del-mysql-management-BASE.files.in:
  Delete: debian/mysql-management-BASE.files.in
BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in:
  Delete: debian/mysql-management-BASE.mysql-management.init.in
BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in:
  Delete: debian/mysql-server-BASE.NEWS.in
BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in:
  Delete: debian/mysql-server-BASE.README.Debian.in
BitKeeper/deleted/.del-mysql-server-BASE.config.in:
  Delete: debian/mysql-server-BASE.config.in
BitKeeper/deleted/.del-mysql-server-BASE.dirs.in:
  Delete: debian/mysql-server-BASE.dirs.in
BitKeeper/deleted/.del-mysql-server-BASE.docs.in:
  Delete: debian/mysql-server-BASE.docs.in
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
  Delete: debian/mysql-server-BASE.files.in
BitKeeper/deleted/.del-mysql-server-BASE.links.in:
  Delete: debian/mysql-server-BASE.links.in
BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in:
  Delete: debian/mysql-server-BASE.lintian-overrides.in
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in
BitKeeper/deleted/.del-my.cnf:
  Delete: debian/additions/my.cnf
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.server.in
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in
BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in:
  Delete: debian/mysql-server-BASE.mysql-server.logrotate.in
BitKeeper/deleted/.del-mysql-server-BASE.postinst.in:
  Delete: debian/mysql-server-BASE.postinst.in
BitKeeper/deleted/.del-mysql-server-BASE.postrm.in:
  Delete: debian/mysql-server-BASE.postrm.in
BitKeeper/deleted/.del-mysql-server-BASE.preinst.in:
  Delete: debian/mysql-server-BASE.preinst.in
BitKeeper/deleted/.del-mysql-server-BASE.prerm.in:
  Delete: debian/mysql-server-BASE.prerm.in
BitKeeper/deleted/.del-mysql-server-BASE.templates.in:
  Delete: debian/mysql-server-BASE.templates.in
BitKeeper/deleted/.del-mysql-server-PREV.preinst.in:
  Delete: debian/mysql-server-PREV.preinst.in
BitKeeper/deleted/.del-mysql-server.lintian-overrides:
  Delete: debian/additions/mysql-server.lintian-overrides
BitKeeper/deleted/.del-mysql-server.preinst.in:
  Delete: debian/mysql-server.preinst.in
BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in:
  Delete: debian/mysql-storage-BASE.dirs.in
BitKeeper/deleted/.del-mysql-storage-BASE.files.in:
  Delete: debian/mysql-storage-BASE.files.in
BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in:
  Delete: debian/mysql-storage-BASE.mysql-storage.init.in
BitKeeper/deleted/.del-mysql-test-BASE.dirs.in:
  Delete: debian/mysql-test-BASE.dirs.in
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
  Delete: debian/mysql-test-BASE.files.in
BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in:
  Delete: debian/mysql-tools-BASE.dirs.in
BitKeeper/deleted/.del-mysql-tools-BASE.files.in:
  Delete: debian/mysql-tools-BASE.files.in
BitKeeper/deleted/.del-rules:
  Delete: debian/rules
BitKeeper/deleted/.del-source.lintian-overrides.in:
  Delete: debian/source.lintian-overrides.in
BitKeeper/deleted/.del-watch:
  Delete: debian/watch
BitKeeper/deleted/.del-POTFILES.in.in:
  Delete: debian/po/POTFILES.in.in
BitKeeper/deleted/.del-ca.po:
  Delete: debian/po/ca.po
BitKeeper/deleted/.del-cs.po:
  Delete: debian/po/cs.po
BitKeeper/deleted/.del-da.po:
  Delete: debian/po/da.po
BitKeeper/deleted/.del-de.po:
  Delete: debian/po/de.po
BitKeeper/deleted/.del-es.po:
  Delete: debian/po/es.po
BitKeeper/deleted/.del-eu.po:
  Delete: debian/po/eu.po
BitKeeper/deleted/.del-fr.po:
  Delete: debian/po/fr.po
BitKeeper/deleted/.del-gl.po:
  Delete: debian/po/gl.po
BitKeeper/deleted/.del-it.po:
  Delete: debian/po/it.po
BitKeeper/deleted/.del-ja.po:
  Delete: debian/po/ja.po
BitKeeper/deleted/.del-nb.po:
  Delete: debian/po/nb.po
BitKeeper/deleted/.del-ndb_mgmd.cnf:
  Delete: debian/additions/ndb_mgmd.cnf
BitKeeper/deleted/.del-nl.po:
  Delete: debian/po/nl.po
BitKeeper/deleted/.del-pt.po:
  Delete: debian/po/pt.po
BitKeeper/deleted/.del-pt_BR.po:
  Delete: debian/po/pt_BR.po
BitKeeper/deleted/.del-ro.po:
  Delete: debian/po/ro.po
BitKeeper/deleted/.del-ru.po:
  Delete: debian/po/ru.po
BitKeeper/deleted/.del-sv.po:
  Delete: debian/po/sv.po
BitKeeper/deleted/.del-templates.pot:
  Delete: debian/po/templates.pot
BitKeeper/deleted/.del-tr.po:
  Delete: debian/po/tr.po

Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
which are constructed using a temporary table fields,
see Item_func_group_concat::setup().
As a) we don't store null bits in the tree where the bit fields store parts 
of their data and b) there's no method to properly compare two table records
we've got problem.

Fix: convert BIT fields to INT in the temporary table used.


mysql-test/r/func_gconcat.result:
  Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
    - test result.
mysql-test/t/func_gconcat.test:
  Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
    - test case.
sql/item_sum.cc:
  Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
    - force the create_tmp_table() to convert BIT columns to INT 
      in order to be able to compare records containing BIT fields.

myisam_sort_buffer_size.

An incorrect length of the sort buffer was used when calculating the
maximum number of keys. When myisam_sort_buffer_size is small enough,
this could result in the number of keys < number of
BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.

Fixed by correcting the buffer length calculation.


myisam/sort.c:
  Use a correct buffer length when calculating the maximum number of keys.
  Assert that for each BUFFPEK structure there is at least one
  corresponding key. Otherwise we would fail earlier and not reach
  merge_buffers().
mysql-test/r/repair.result:
  Added a test case for bug #31174.
mysql-test/t/repair.test:
  Added a test case for bug #31174.

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

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


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged

Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
fix is to check thd for NULL before using it.


sql/sql_class.cc:
  It is possible that mark_transaction_to_rollback() may be
  called in rare circumstances when thd is NULL (e.g., from
  some calls to convert_error_code_to_mysql()).  Don't use thd
  if it is NULL.

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

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

into  polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878


mysql-test/r/innodb_mysql.result:
  Null merge.
mysql-test/t/innodb_mysql.test:
  Null merge.
sql/field.cc:
  Null merge.

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

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


sql/mysqld.cc:
  Auto merged

as PS protocol gives slightly different metadata.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  mysql.com:/home/ram/work/b31249/b31249.5.0


mysql-test/r/type_datetime.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge

bitmap_is_set(table->write_set, fiel

Problem: creating a temporary table we allocate the group buffer if needed
followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
the group buffer than actually needed (used) for values retrieval may lead 
to overlapping with followed bitmaps in the memory pool that in turn leads 
to unpredictable consequences.

As we use Item->max_length sometimes to calculate group buffer size,
it must be set to proper value. In this particular case 
Item_datetime_typecast::max_length is too small.

Another problem is that we use max_length to calculate the group buffer
key length for items represented as DATE/TIME fields which is superfluous.

Fix: set Item_datetime_typecast::max_length properly,
accurately calculate the group buffer key length for items 
represented as DATE/TIME fields in the buffer.


mysql-test/r/type_datetime.result:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - test result.
mysql-test/t/type_datetime.test:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - test case.
sql/item_timefunc.h:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - set Item_datetime_typecast::max_length properly.
sql/sql_select.cc:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - the group buffer key length for items represented as 
  DATE/TIME fields in the buffer should be calculated using
  the maximum pack length of such fields (== 8), using 
  max_length here is redundant.

into  alf.(none):/src/bug28774/my50-bug28774

doesn't clean them up
- Make sure to cleanup temporary files after use.


client/mysql_upgrade.c:
  Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
  doesn't clean them up
  - Close file handle and delete temporary file when write fails.

into  sin.intern.azundris.com:/home/tnurnberg/31253/50-31253

into  sin.intern.azundris.com:/home/tnurnberg/19828/50-19828


mysql-test/r/grant.result:
  Auto merged