into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29104

into  mysql.com:/home/hf/work/28839/my50-28839

into  mysql.com:/home/hf/work/28839/my50-28839

Occasionally mysqlbinlog --hexdump failed with error:
  ERROR 1064 (42000) at line ...: You have an error in your
  SQL syntax; check the manual that corresponds to your MySQL
  server version for the right syntax to use near
  'Query thread_id=... exec_time=... error_code=...

When the length of hexadecimal dump of binlog header was
divisible by 16, commentary sign '#' after header was lost.
The Log_event::print_header function has been modified to always
finish hexadecimal binlog header with "\n# ".

The abort happened when a query contained a conjunctive predicate
of the form 'view column = constant' in the WHERE condition and 
the grouping list also contained a reference to a view column yet
a different one.

Removed the failing assertion as invalid in a general case.

Also fixed a bug that prevented applying some optimization for grouping
queries using views. If the WHERE condition of such a query contains
a conjunctive condition of the form 'view column = constant' and
this view column is used in the grouping list then grouping by this
column can be eliminated. The bug blocked performing this elimination.

into  magare.gmz:/home/kgeorge/mysql/work/B29116-5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt

  Updated test case for bug #28898. Additional cleanup.

slave_sql thread calls thd->clear_error() to force error to be ignored,
though this method didn't clear thd->killed state, what causes
slave_sql thread to stop.

clear thd->killed state if we ignore an error

into  gleb.loc:/home/uchum/work/bk/5.0-opt

For a join query with GROUP BY and/or ORDER BY and a view reference
in the FROM list the metadata erroneously showed empty table aliases
and database names for the view columns.

 counters from relay

Updated the test to return columns vertically.

into  mysql.com:/home/hf/work/29117/my50-29117

we use net->vio in my_net_local_init, but in the my_net_init
implementation we set it after the call, so work with unspecified
net->vio value

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0

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

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27130

represented by an expression of the type UNSIGNED INT and this 
expression was evaluated to 0 then the function erroneously returned
the value of the first argument instead of an empty string. 

This problem was introduced by the patch for bug 10963.

The problem has been resolved by a proper modification of the code of
Item_func_substr::val_str.

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

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

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

- correct test and result file

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

  Updated test case for bug #28625.

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  gleb.loc:/home/uchum/work/bk/5.0-opt-28625

DECIMAL column was used instead of BIGINT for the minimal possible
BIGINT (-9223372036854775808).

The Item_func_neg::fix_length_and_dec has been adjusted to
to inherit the type of the argument in the case when it's an 
Item_int object whose value is equal to LONGLONG_MIN.

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

  Post-merge fix: replace xid=* with XID to isolate from number of transactions

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg