into  mysql.com:/home/ram/work/b30654/b30654.5.1


client/mysqlcheck.c:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/t/mysqlcheck.test:
  manual merge.

names include backticks or blank

Problem: mysqlcheck doesn't escape backtick characters in the table names.

Fix: escape them.


client/mysqlcheck.c:
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
    - escape backtick characters in the table names.
mysql-test/r/mysqlcheck.result:
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
    - test result.
mysql-test/t/mysqlcheck.test:
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
    - test case.

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

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

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


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

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

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


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
storage/heap/hp_hash.c:
  the code was changed to use bitmaps instead of key length, so ul

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


BitKeeper/deleted/.del-changelog~8457b43736642c:
  Auto merged
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Auto merged
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Auto merged
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Auto merged
BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
  Auto merged
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
  Auto merged
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
  Auto merged
BitKeeper/deleted/.del-ac~66b41066a435209:
  Auto merged
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
  Auto merged
BitKeeper/deleted/.del-ae~c54b032746985759:
  Auto merged
BitKeeper/deleted/.del-az~45092291b7eff90a:
  Auto merged
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
  Auto merged
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
  Auto merged
BitKeeper/deleted/.del-move~6b750ba06050bc92:
  Auto merged
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
  Auto merged
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
  Auto merged
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
  Auto merged
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
  Auto merged
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
  Auto merged
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
  Auto merged
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
  Auto merged
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
  Auto merged
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
  Auto merged
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
  Auto merged
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
  Auto merged

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

into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-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/51-30951

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

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


sql/mysqld.cc:
  Auto merged

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

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

into  polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254


include/my_global.h:
  Auto merged

(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/51-30951

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

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


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
sql-common/my_time.c:
  Auto merged

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/51-30821


sql/mysqld.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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


sql/mysqld.cc:
  NULL merge

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.

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


BitKeeper/deleted/.del-changelog:
  Auto merged
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
  Auto merged
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
  Auto merged
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
  Auto merged
BitKeeper/deleted/.del-rules:
  Auto merged
Makefile.am:
  Merged in removal of debian dir from 5.0-maint

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.

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

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


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged

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

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


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

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


configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

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

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


sql/sql_class.cc:
  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.1-maint

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

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