into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt

added correct handling of NULL values for lookup fields

into  mysql.com:/home/hf/work/30638/my51-30638

into  mysql.com:/home/hf/work/30638/my51-30638

into  mysql.com:/home/hf/work/30638/my50-30638

into  mysql.com:/home/hf/work/30638/my50-30638

into  mysql.com:/home/hf/work/30638/my51-30638

into  mysql.com:/home/hf/work/30638/my51-30638

into  mysql.com:/home/hf/work/29801/my51-29801

into  mysql.com:/scratch/tnurnberg/31588/50-31588

into  mysql.com:/scratch/tnurnberg/31588/51-31588

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

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

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

into  polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550

  
Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
  
This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().

into  sin.intern.azundris.com:/misc/mysql/31588/51-31588

into  magare.gmz:/home/kgeorge/mysql/autopush/B31157-5.1-opt

The uncacheable flag should be set at fix_fields() stage.
Fixed by moving the flag setting to match the one in 5.1

into  mysql.com:/scratch/tnurnberg/31588/50-31588

into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B31221-5.0-opt

 No warning was generated when a TIMESTAMP with a non-zero time part
 was converted to a DATE value. This caused index lookup to assume
 that this is a valid conversion and was returning rows that match 
 a comparison between a TIMESTAMP value and a DATE keypart.
 Fixed by generating a warning on such a truncation.

The BIG_TABLES define wasn't enabled on Windows.
#define added

post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output

into  sin.intern.azundris.com:/misc/mysql/31588/51-31588

into  sin.intern.azundris.com:/misc/mysql/31588/50-31588

Buffer used when setting variables was not dimensioned to accomodate
trailing '\0'. An overflow by one character was therefore possible.
CS corrects limits to prevent such overflows.

into  magare.gmz:/home/kgeorge/mysql/autopush/B27099-5.1-opt

move 'table_collation' field filling outside of if(file) condition
because this field has 'OPEN_FRM_ONLY' attribute

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

updated result files

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

On Windows the debug log was doing freopen () instead of
fflush() and that was slowing the logging down that much 
that some tests timed out.
Fixed by replacing the freopen() with an syncing-to-disk
flag to fopen() and fflush().
Also increased the timeout of the tests running with --debug
on windows : seems to slow down as much as valgrind on linux.

issue an error if string has illegal characters

into  gleb.loc:/home/uchum/work/bk/5.1-opt