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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

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

  Reverted fix for bug#18360

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1

Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.

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

  Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
  Avoid error message for target 'distclean' and no Makefile

  Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt

  Include "sql_yacc.yy" for completeness (bug#20387)

  Delete: netware/mysql_install.def
Makefile.am:
  Removed obsolete "mysql_install.def"

  Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into moonbone.local:/work/16377-4.1-after

  Post fix for bug#16377

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

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

- correction of backport error

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

- make sure to disable bulk insert when check for duplicate key is needed

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

corrupt
  - add infinite retry on drop table temporary error

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

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

can lead to a wrong result.

All date/time functions has the STRING result type thus their results are
compared as strings. The string date representation allows a user to skip 
some of leading zeros. This can lead to wrong comparison result if a date/time 
function result is compared to such a string constant.

The idea behind this bug fix is to compare results of date/time functions
and data/time constants as ints, because that date/time representation is 
more exact. To achieve this the agg_cmp_type() is changed to take in the
account that a date/time field or an date/time item should be compared 
as ints.

This bug fix is partially back ported from 5.0.

The agg_cmp_type() function now accepts THD as one of parameters. 
In addition, it now checks if a date/time field/function is present in the
list. If so, it tries to coerce all constants to INT to make date/time
comparison return correct result. The field for the constant coercion is
taken from the Item_field or constructed from the Item_func. In latter case
the constructed field will be freed after conversion of all constant items.
Otherwise the result is same as before - aggregated with help of the
item_cmp_type() function.

From the Item_func_between::fix_length_and_dec() function removed the part
which was converting date/time constants to int if possible. Now this is 
done by the agg_cmp_type() function.

The new function result_as_longlong() is added to the Item class. 
It indicates that the item is a date/time item and result of it can be
compared as int. Such items are date/time fields/functions.

Correct val_int() methods are implemented for classes Item_date_typecast, 
Item_func_makedate, Item_time_typecast, Item_datetime_typecast. All these
classes are derived from Item_str_func and Item_str_func::val_int() converts
its string value to int without regard to the date/time type of these items.

Arg_comparator::set_compare_func() and Arg_comparator::set_cmp_func()
functions are changed to substitute result type of an item with the INT_RESULT
if the item is a date/time item and another item is a constant. This is done
to get a correct result of comparisons like date_time_function() = string_constant.

into  mysql.com:/home/marty/MySQL/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

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

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