Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
case.test, case.result:
  Added test cases for bug #9939.

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

  Fixed bug #10982.
item.cc:
  Fixed bug #10982. In the function Item_ref::val_decimal
  by mistake the method Item_ref::val_decimal was used
  instead of Item_ref::val_decimal_result.

  Post merge corrections.

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0

    information schema table names are always upper case table names

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

into mysql.com:/opt/local/work/mysql-5.0-7306-new

into mysql.com:/opt/local/work/mysql-5.0-7306-new

"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.

into mysql.com:/home/dlenev/src/mysql-5.0-ttdf

databases" and basic handling of errors which happen in triggers.
(The bug itself was fixed by several previous patches).
Fixed bug in multi-delete which were exposed by these tests.

  Post-review modifications for the fix of bug #7894.

  Added test cases for bug #7894.
sql_select.cc:
  Fixed bug #7894: GROUP BY queries with ROLLUP returned
  wrong results for expressions containing group by columns.
  The fix ensured correct results by replacement of all
  occurrences of group by fields in non-aggregate expressions
  for corresponding ref objects and preventing creation of
  fields in temporary tables for expression containing group
  by fields.

into mysql.com:/home/pem/work/mysql-5.0

into  moonbone.local:/work/mysql-5.0-bug-9593

server"
Bug appears only on Windows platform. Freeing memory in 
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in 
setup_copy_fields() results in memory destruction. In test IF used instead 
of CONCAT because IF have more stable crash.

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into radha.local:/Users/patg/mysql-5.0

  "." is not in the PATH...

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  by simply disabling FLUSH for stored functions. (I can't really work.)

  Check in Jan's fix to bug #10746 and also add a note to ::start_stmt() that stored procs in 5.0 call it

    set net->no_send_error to 0 before execution of each element of
    multiquery statement to provide the sending of error to client

                  results.
  Actually a problem when converting decimal to int for user variables.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-5.0-ttdf

We can't have Item_trigger_field as aggregated object inside of
sp_instr_set_trigger_field class since in this case its destructor
will be called twice. So instead let us create this Item separately
and store pointer to it in instruction object.

 - Remove the expected warrnings when "show binary logs" are called on zero size binary log files.