into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl

into  romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl

Post-merge fixes.

into  romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl

Tail fixes after re-applying patches to older version of clone.

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_25543

  Field_bit::pack() and Field_bit::unpack() does not work correctly

Fixing code for Field_bit packing and unpacking to work with arbitrary
pointers instead of requiring Field::ptr

into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl

           field does not work

Fix to prevent MyISAM from reading data from NULL BLOB.
Fix to make record comparison independent of values of unused bits in
record.
Updating binlog positions in tests.

into  mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543

into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql

When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.

Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql

Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.

away.

Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.

When rand() is called multiple times inside a stored procedure, the server does 
not binlog the correct random seed values.

This patch corrects the problem by resetting rand_used= 0 in 
THD::cleanup_after_query() allowing the system to save the random seeds if needed
for each command in a stored procedure body.

However, rand_used is not reset if executing in a stored function or trigger 
because these operations are binlogged by call and thus only the calling statement
need detect the call to rand() made by its substatements. These substatements must 
not set rand_used to 0 because it would remove the detection of rand() by the 
calling statement.

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

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

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

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

 Fixed boundry checks in the INSERT() function:
 were one off.

into  olga.mysql.com:/home/igor/mysql-5.0-opt

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the 
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)

into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt

into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2

  Postfix for bug#22331.