into  hasky.mysql.fi:/home/sanja/work-merge-5.0

  postmerge fix
subselect.result:
  new 5.0 result (postmerge)

into  hasky.mysql.fi:/home/sanja/work-merge-5.0

into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1

into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1

  Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)

Now we keep all active XID's in a hash

view being created.

Item_func_timestamp_diff::func_name() were returning function name as
"timestamp_diff" thus when view was executed function parameters wasn't 
properly recognized and error was raised.

Disabled one test case because it is still a problem due to the fix for WL#2486.
Pushed to enable code review.

into  mysql.com:/home/timka/mysql/src/5.0-2486-merge

"Process NATURAL and USING joins according to SQL:2003".

* Some of the main problems fixed by the patch:
  - in "select *" queries the * expanded correctly according to
    ANSI for arbitrary natural/using joins
  - natural/using joins are correctly transformed into JOIN ... ON
    for any number/nesting of the joins.
  - column references are correctly resolved against natural joins
    of any nesting and combined with arbitrary other joins.

* This patch also contains a fix for name resolution of items
  inside the ON condition of JOIN ... ON - in this case items must
  be resolved only against the JOIN operands. To support such
  'local' name resolution, the patch introduces a stack of
  name resolution contexts used at parse time.

NOTICE:
- This patch is not complete in the sense that
  - there are 2 test cases that still do not pass -
    one in join.test, one in select.test. Both are marked
    with a comment "TODO: WL#2486".
  - it does not include a new test specific for the task

into mysql.com:/space/my/mysql-5.0

into  127.(none):/home/osku/mysql-5.0

  After merge change.
  4.1 method was replaced in 5.0.

into mysql.com:/space/my/mysql-4.1-merge

into mysql.com:/space/my/mysql-5.0-build

into  mysql.com:/usr/home/bar/mysql-5.0

into  mysql.com:/usr/home/bar/mysql-4.1.b12351

into mysql.com:/space/my/mysql-5.0-build

  A safety correction.

into  127.(none):/home/osku/mysql-5.0

most notably deadlocked ones in SHOW INNODB STATUS. Fixes bug #7819.

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  Fixed bug #12470.
  A misplaced initialization of the cond_count counter
  resulted in a wrong calculation of it. This caused a memory
  corruption since this counter was used as a parameter of
  some memory allocation.
view.test:
  Added a test case for bug #12470.

into mysql.com:/space/my/mysql-4.1-merge

number of seconds (which can include microseconds). (Bug #6760)

into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean

earlier change wasn't correct. (But the other changes to the test were.)

  Fixed bug #12382.
  INSERT statement effectively changed thd->set_query_id to 0,
  while SELECT statement changed it to 0. As a result
  the insert_fields function that expanded '*' was called
  with different values of thd->set_query_id for the query
  SELECT * FROM view depending on whether it was run after
  an INSERT or after a SELECT statement. This was corrected
  by restoring the old value of thd->set_query_id when
  returning from the function setup_fields where possible
  reset could occur.
  If the value of thd->set_query_id == 0 then the fields
  substituted instead of '*' were not registered as used
  for bitmaps used_keys. This caused selection of an invalid
  execution plan for the query SELECT * from <view>.
view.result, view.test:
  Added a test case for bug #12382.

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean

automatically. (Bug #12324)

  preflight/postflight instead, so they are run every time a PKG is installed, not only for
  a fresh installation

into quadxeon.mysql.com:/users/vtkachenko/bk/mysql-5.0-tmp

  change was too drastic) (BUG#12506)

into  xiphis.org:/usr/home/antony/work2/merge-5.0