into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

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


BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
configure.in:
  Auto merged

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
configure.in:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
configure.in:
  Auto merged

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


mysql-test/t/ndb_single_user.test:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
mysql-test/r/ndb_single_user.result:
  manual merge

  - enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed

- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed


mysql-test/r/ndb_single_user.result:
  Bug #27710 Creating unique index fails during single user mode
mysql-test/t/ndb_single_user.test:
  Bug #27710 Creating unique index fails during single user mode

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

  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  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

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  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysql_system_tables.sql:
  Manual merge
scripts/mysql_system_tables_data.sql:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Change syntax for starting manual ddd or gdb to avoid having to
change working dir 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  f
  Use local

Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command

BitKeeper/deleted/.del-ParamInfo.hpp:
  Delete: storage/ndb/src/mgmsrv/ParamInfo.hpp
BitKeeper/deleted/.del-ParamInfo.cpp:
  Delete: storage/ndb/src/mgmsrv/ParamInfo.cpp

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

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