into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
  Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
  Merge

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

ha_ndbcluster_cond.
Added new files:
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_cond.cc

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

Bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296  Truncate table converts NDB disk based tables to in-memory tables: Added more checks in tests

Bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296  Truncate table converts NDB disk based tables to in-memory tables: Check table storage before creating columns

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

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  redo checkSchemaState to handle bug (plus prepare to handle other DD related bugs in the area)

  new big test prg testDict -n DictRestart
  new bug test prg testDict -n Bug21755

  refactor testSRBank and create new class NdbMixRestarter

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

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

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

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

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

  - 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

  fix COPY_ROWID return value

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

  After merge fix.

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

  Fix warning after fix for bug#27321.

  After merge fix.

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

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.

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