into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Manual merge, adapting to additional "embedded" files in 5.1

into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Manual merge, adapting to expanded 5.0 filelist.

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


support-files/mysql.spec.sh:
  SCCS merged

support-files/mysql.spec.sh:
  More man pages.

support-files/mysql.spec.sh:
  Another man page.

into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Auto merged

into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own.

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


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own (NDB).

support-files/mysql.spec.sh:
  Add man pages for NDB.

support-files/mysql.spec.sh:
  Add the man pages for NDB.

support-files/mysql.spec.sh:
  Add the man pages for NDB.

support-files/mysql.spec.sh:
  Add missing man pages.

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

  Correction of embedded build types


VC++Files/mysql.sln:
  Correction of embedded build types

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

  Disabled build of all embedded server libraries, "libmysqld.ldd"
  "mysqldemb.lib" and "mysqlserver.lib"


VC++Files/mysql.sln:
  Disabled build of all embedded server libraries, "libmysqld.ldd"
  "mysqldemb.lib" and "mysqlserver.lib"

into  trift2.:/MySQL/M51/push-5.1


scripts/make_binary_distribution.sh:
  Auto merged

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


Docs/Makefile.am:
  Auto merged

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


Docs/Makefile.am:
  Auto merged

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

  EXCEPTIONS-CLIENT is now static part of repository


Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository

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


Docs/Makefile.am:
  Auto merged

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


Docs/Makefile.am:
  Auto merged

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


Docs/Makefile.am:
  SCCS merged

  EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT


EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository

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


configure.in:
  SCCS merged

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

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


configure.in:
  SCCS merged

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

into  trift2.:/MySQL/M51/merge-5.1


scripts/make_binary_distribution.sh:
  Null merge, it is a backport from 5.1 to 5.0 anyway.

into  trift2.:/MySQL/M50/push-5.0

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

into  mysql.com:/home/kent/bk/mysql-5.1.16-build


client/sql_string.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

into  mysql.com:/home/psergey/mysql-5.1-bug26117

Before the fix: 
  ha_partition objects had ha_partition::m_part_info==NULL and that caused
  crash
After: 
- The new ha_partition::clone() function makes the clones use parent's
  m_part_info value.
- The parent ha_partition object remains responsible for deallocation of
  m_part_info.


mysql-test/r/partition_innodb.result:
  BUG#26117 "index_merge sort-union over partitioned table crashes"
   - Testcase
mysql-test/t/partition_innodb.test:
  BUG#26117 "index_merge sort-union over partitioned table crashes"
   - Testcase

storage/innobase/pars/lexyy.c:
  Fix compiler warnings (fix is also in pars0lex.l)
support-files/compiler_warnings.supp:
  Extra safety to ensure we really get rid of warning :)