into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

- Fix for
    Bug#28827 Partition test needs archive engine
    Bug#26669 Two tests on partition fail while blackhole engine is missing
  Solution: Move ARCHIVE and BLACKHOLE sub test cases to their own main test.
- The two bugs above + the fact that CSV could be also sometimes not
  available --> Move also CSV sub tests out.
- Minor cleanups
  - Replace error numbers with error names
  - fix typos, wrong comments
  - remove redundant sub test cases
  - add missing drop database
  - SET GLOBAL general_log = default is wrong, = 1 is correct

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/bug31644-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-runtime

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge

into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime

into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime

The general log write function (general_log_print) uses printf style
arguments which need to be pre-processed, meaning that the all arguments
are copied to a single buffer and the problem is that the buffer size is
constant (1022 characters) but queries can be much larger then this.

The solution is to introduce a new log write function that accepts a
buffer and it's length as arguments. The function is to be used when
a formatted output is not required, which is the case for almost all
query write-to-log calls.

This is a incompatible change with respect to the log format of prepared
statements.

into  four.local.lan:/WORK/mysql-5.1-build/src-clean

into  four.local.lan:/WORK2/merge/mysql-5.1-31556

Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order

and the modified values of the compile-related variables used in "configure".

Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".

This fixes bug#31644
   Values of *FLAGS that were used for building packages is missed in mysqlbug

into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime

    
Previously, UDF *_init functions were passed constant strings with erroneous lengths. The length came from the containing variable's size, not the length of the value itself.
    
Now the *_init functions get the constant as a null terminated string with the correct length supplied too.

into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime

Post merge fixes: close any open statement before
the change user command and fix test case output.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

in middle of block)

into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime

The problem was that the RETURNS column in the mysql.proc was of
CHAR(64). That was not enough for storing long-named datatypes.

The fix is to change CHAR(64) to LONGBLOB, and to throw warnings
at the time a stored routine is created if some data is truncated
during writing into mysql.proc.

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge