into  debian.(none):/M51/bug27739-5.1


configure.in:
  Auto merged

                 not some other tool (file system checker on Tru64).

Patch originally supplied by Peter O'Gorman, slightly modified by me.

Bug#27739 "build fails on Tru64 due to icheck test in configure"


configure.in:
  We use "icheck" as a tool to check against ABI changes.
  However, some systems (like Tru64) have "icheck" as a file system checker.
  So if "icheck" is found, it should be verified that this really is the
  ABI checker and not some other tool.
  
  Patch originally supplied by Peter O'Gorman, slightly modified by me.
  
  Bug#27739 "build fails on Tru64 due to icheck test in configure"

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

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


sql/ha_ndbcluster.cc:
  Manual merge: Append "LL" to hex constants beyond 32 bit.

    Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.


sql/ha_ndbcluster.cc:
  Hex constants that exceed 32 bit need to be marked "LL" for the compile to work
  (discovered on a Debian PPC box, 32-bit big-endian, running gcc 3.3.6).

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build


sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged

into  trift2.:/MySQL/M51/limit-man-5.1


configure.in:
  Auto merged

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

into  trift2.:/MySQL/M51/limit-man-5.1

into  trift2.:/MySQL/M51/limit-man-5.1

Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1


configure.in:
  Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1

into  janus.mylan:/usr/home/serg/Abk/mysql-5.0

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

also control the list of man pages installed, so that they correspond better to the binaries.

This is the second version of this fix, including review comments.


configure.in:
  Several of our man pages are specific to parts (table handlers, features, ...)
  which are controlled by "configure" options, so there are builds which do not
  include these parts.
  For such builds, remove those specific man pages from the list of man pages
  to be installed, so that the man pages correspond better to the binaries.
  
  In this patch, do it for NDB (modify Kent's approach), "embedded", and InnoDB.
  
  Ensure that the handling of the man pages is determined only after the options
  have been processed, the old nandling (NDB only) was done too early.
  
  This is the second version of this fix, including review comments.

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

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

  After merge fix.


mysql-test/r/subselect.result:
  After merge fix.

into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt


mysql-test/r/subselect3.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/subselect.result:
  Manual merge
mysql-test/t/subselect.test:
  Manual merge

  Fix warning after fix for bug#27321.


sql/item.cc:
  Fix warning after fix for bug#27321.

  After merge fix.


mysql-test/r/subselect.result:
  After merge fix.
mysql-test/t/subselect.test:
  After merge fix.

into  moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql


mysql-test/r/subselect3.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  Manually merged
mysql-test/t/subselect.test:
  Manually merged
mysql-test/t/subselect3.test:
  Manually merged

The Item_outer_ref class based on the Item_direct_ref class was always used
to represent an outer field. But if the outer select is a grouping one and the 
outer field isn't under an aggregate function which is aggregated in that
outer select an Item_ref object should be used to represent such a field.
If the outer select in which the outer field is resolved isn't grouping then
the Item_field class should be used to represent such a field.
This logic also should be used for an outer field resolved through its alias
name.

Now the Item_field::fix_outer_field() uses Item_outer_field objects to
represent aliased and non-aliased outer fields for grouping outer selects
only.
Now the fix_inner_refs() function chooses which class to use to access outer
field - the Item_ref or the Item_direct_ref. An object of the chosen class
substitutes the original field in the Item_outer_ref object.
The direct_ref and the found_in_select_list fields were added to the
Item_outer_ref class.


mysql-test/t/subselect3.test:
  Some test cases were corrected after the fix for the bug#27321.
mysql-test/r/subselect3.result:
  Some test cases were corrected after the fix for the bug#27321.
mysql-test/t/subselect.test:
  Added a test case for the bug#27321: Wrong subquery result in a grouping select.
mysql-test/r/subselect.result:
  Added a test case for the bug#27321: Wrong subquery result in a grouping select.
  Some test cases were corrected after this fix.
sql/sql_union.cc:
  Bug#27321: Wrong subquery result in a grouping select.
  Cleanup of the inner_refs_list.
sql/sql_select.cc:
  Bug#27321: Wrong subquery result in a grouping select.
  Now the fix_inner_refs() function chooses which class to use to access outer
  field - the Item_ref or the Item_direct_ref. An object of the chosen class
  substitutes the original field in the Item_outer_ref object.
  A comment is corrected.
sql/item.cc:
  Bug#27321: Wrong subquery result in a grouping select.
  Now the Item_field::fix_outer_field() uses Item_outer_field objects to
  represent aliased and non-aliased outer fields for grouping outer selects
  only.
sql/item.h:
  Bug#27321: Wrong subquery result in a grouping select.
  The direct_ref and the found_in_select_list fields were added to the
  Item_outer_ref class.

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt

into  mysql.com:/d2/hf/mrg/mysql-4.1-opt

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged

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


include/Makefile.am:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/r/ndb_restore.result:
  manual merge
mysql-test/t/ndb_restore.test:
  manual merge

- autoincrement column of size medium int not handled in ndb_restore
- added testcase also for other types, tiny, small... etc

Bug#27456    decimal.h is not installed with public include files

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt