into  siva.hindu.god:/usr/home/tim/m/bk/beef-51

into  siva.hindu.god:/usr/home/tim/m/bk/beef-50

- 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/b20536-51

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  siva.hindu.god:/usr/home/tim/m/bk/b20536-51

into  zim.(none):/home/brian/mysql/remove-bdb-5.1

into  romeo.(none):/home/bk/mytap-mysql-5.1-new-maint

These are using old version of the Test::Harness modules, so I resort
to a safer way of running executable files.

Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references. 

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  zim.(none):/home/brian/mysql/remove-bdb-5.1

into  rama.(none):/home/jimw/my/mysql-5.1-clean

into  zim.(none):/home/brian/mysql/remove-bdb-5.1

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

  After merge fix

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

into  sunlight.local:/local_work/leak_fix-5.1-mysql

(this is not a fix to the bug, but simply to disable the test in 
order to push a 5.0 to 5.1 merge)

This merge contains:

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

  Correct memory leak fix

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

we didn't check for NULL value of the
lex_create_info->db_type pointer.
The pointer is NULL in the case, when the engine name is
unknown to the server. This happens with NDB on Windows.

into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug

into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c

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

into  rama.(none):/home/jimw/my/mysql-5.1-clean

Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row.

into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c