the old problem - mysqltest can't handle multiple connections in the
embedded server properly. So i disabled the test for the embedded mode
until mysqltest is fixed

into  trift2.:/M41/push-4.1

into  trift2.:/M41/push-4.1

 - Send confusing output to /dev/null

into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

  Filter out strange control characters, messes up logs

into  mysql.com:/usr/home/ram/work/4.1.b16327

into  mysql.com:/home/hf/work/mysql-4.1.19983

 - backport patch from 5.0
 - "table" can be NULL in temporary fields used for type conversion

  Added new "mysql_explain_log" man page
  Added missing install of "myisam_ftdump" man page
  Added missing install of "mysqlman" man page

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

Please use "ul" when merging this changeset to 5.0.

1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
    but rather the boolean values 'false' and 'true'.
2) Add the module to the various Windows description files.

In 5.0, this is already solved, so that is a null-merge ("ul").

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461

  Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)

into  mysql.com:/usr/home/ram/work/4.1.b15195

to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)

into  rakia.(none):/home/kgeorge/mysql/autopush/B17212-4.1-opt

into  mysql.com:/home/hf/work/mysql-4.1.16017

into  mysql.com:/home/hf/work/mysql-4.1.16017

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5

into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977

do not look for client-specific commands while inside a multi-line comment.
we will allow multi-comments pretty much anywhere within SQL-statements,
but client-specific commands (help, use, print, ...) must be the first token
in the input.

into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-4.1-rpl

  * don't use join cache when the incoming data set is already ordered
    for ORDER BY
    This choice must be made because join cache will effectively
    reverse the join order and the results will be sorted by the index
    of the table that uses join cache.

into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.1

into  moonbone.local:/work/16302-bug-4.1-opt-mysql

into  moonbone.local:/work/18503-bug-4.1-mysql

may return a wrong result.

An Item_sum_hybrid object has the was_values flag which indicates whether any
values were added to the sum function. By default it is set to true and reset
to false on any no_rows_in_result() call. This method is called only in
return_zero_rows() function. An ALL/ANY subquery can be optimized by MIN/MAX
optimization. The was_values flag is used to indicate whether the subquery
has returned at least one row. This bug occurs because return_zero_rows() is
called only when we know that the select will return zero rows before
starting any scans but often such information is not known.
In the reported case the return_zero_rows() function is not called and
the was_values flag is not reset to false and yet the subquery return no rows
Item_func_not_all and Item_func_nop_all functions return a wrong
comparison result.

The end_send_group() function now calls no_rows_in_result() for each item
in the fields_list if there is no rows were found for the (sub)query.

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5

    
The problem is that the author used the wrong function to send a warning to the 
user about truncation of data.  push_warning() takes a constant string and 
push_warning_printf() takes a format and variable arguments to fill it.

Since the string we were complaining about contains percent characters, the 
printf() code interprets the "%Y" et c. that the user sends.  That's wrong, and
often causes a crash, especially if the date mentions seconds, "%s".

A alternate fix would be to use  push_warning_printf(..., "%s", warn_buff) .

into  moonbone.local:/work/16302-bug-4.1-opt-mysql

into  moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1

into  moonbone.local:/work/allany-4.1-mysql