into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41

Null merge to 5.0

Default is "var/tmp" 

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

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

into  maint1.mysql.com:/data/localhome/tsmith/bk/41

into  siva.hindu.god:/usr/home/tim/m/bk/41

- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors

into  siva.hindu.god:/usr/home/tim/m/bk/41

Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).

Also, convert an sql_print_error -> sql_print_information for a non-error server event.

into  maint1.mysql.com:/data/localhome/tsmith/bk/41

into  lamia.home:/home/timka/mysql/src/4.1-bug-21456

GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
optimization because ORDER BY may be removed when GROUP BY/DISTINCT
sorts as a side effect, e.g. in 
  SELECT DISTINCT <non-key-col>,<pk> FROM t1
  ORDER BY <non-key-col> DISTINCT
must be removed before ORDER BY as if done the other way around
it will remove both.

  Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)

into  mysql.com:/home/hf/work/mysql-4.1.clean

into  mysql.com:/home/hf/work/mysql-4.1.clean

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

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

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1

  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  - if there are two character set definitions in the column declaration,
    we replace the first one with the second one as we store both in the LEX->charset
    slot. Add a separate slot to the LEX structure to store underscore charset.
  - convert default values to the column charset of STRING, VARSTRING fields 
    if necessary as well.

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

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678

Socket timeouts in client library were used only on Windows.

The solution is to use socket timeouts in client library on all
systems were they are supported.

No test case is provided because it is impossible to simulate network
failure in current test suit.

into  april.(none):/home/svoj/devel/mysql/BUG18874/mysql-4.1

Fixed by moving update_key_parts() down to be after write_index().

Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
    
Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.

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

didn't work as expected: collation_server was set not to xxx,
but to the default collation of character set "yyy".
    
With different argument order it worked as expected:
mysqld --character-set-server=yyy --collation-server=yyy 
    
Fix:
initializate default_collation_name to 0
when processing --character-set-server
only if --collation-server has not been specified
in command line.

--with-collation worked only on the server side.
Client side ignored this argument, so collation_connection
was not properly set (remained latin1_swedish_ci).