into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge

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

into  romeo.(none):/home/bk/merge-mysql-5.1

into  romeo.(none):/home/bk/merge-mysql-5.1

into  romeo.(none):/home/bk/merge-mysql-5.0

into  romeo.(none):/home/bkroot/mysql-5.0-rpl

into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl

revert back to old show_binlog_events asto many test failures, and create a show_binlog_events2 instead

 - test case

- both for data schema operations
- also make sure schema events vet the right server id when injected into the binlog
- use same mechanism to signal server_id in bug#17095, and reserve some "id's" for flagging special conditions on the event, in this case do not log it
- enable printing of server ids in the testcases to show that we cot it right

- make sure any value is set for linked operations as well, e.g. blob tables

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel

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

into  mysql.com:/home/my/mysql-5.1

(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
Marked federated_server as a '--big-test'
Change error in net_clear to 'Note', as it interfered with mysql-test-run.

compile warnings on windows machines.

refining the test with active innodb

tests for the bug and associated is moved into another file because
they appeared to be binlog-format sensitive.

Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"

into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl

  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  vajra.(none):/opt/local/work/mysql-5.1-runtime

into  vajra.(none):/opt/local/work/mysql-5.1-runtime

into  vajra.(none):/opt/local/work/mysql-5.0-runtime