into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql

  After merge fix

into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql

into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql

into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql

into  sunlight.local:/home/evgen/bk-trees/mysql-5.1-opt

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

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

 - Add loop in mysqlslap that tries to connect up to 10 times if connect
   in thread fails.

into  rakia.(none):/home/kgeorge/mysql/autopush/B21019-5.0-opt

into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt

into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-5.0-opt

 - Disable 3 test cases that crashes slave

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

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

into  moonbone.local:/work/19862-bug-5.0-opt-mysql

  Post review changes for bug#19862.

into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt

into  macbook.gmz:/Users/kgeorge/mysql/work/B20792-5.0-opt

When processing aggregate functions all tables values are reset
to NULLs at the end of each group. 
When doing that if there are no rows found for a group
the const tables must not be reset as they are not recalculated 
by do_select()/sub_select() for each group.

into  rakia.(none):/home/kgeorge/mysql/autopush/B21019-4.1-opt

  Correct merge

into  macbook.gmz:/Users/kgeorge/mysql/work/B21019-5.0-opt

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

 - Add prelocking for stored procedures that uses sp or sf
 - Update test result for sp_error(reported as bug#21294)
 - Make note about new error message from sp-error(bug#17244)

 When optimizing conditions like 'a = <some_val> OR a IS NULL' so that they're
 united into a single condition on the key and checked together the server must 
 check which value is the NULL value in a correct way : not only using ->is_null 
 but also check if the expression doesn't depend on any tables referenced in the 
 current statement. 
 This additional check must be performed because that optimization takes place 
 before the actual execution of the statement, so if the field was initialized 
 to NULL from a previous statement the optimization would be applied incorrectly.

into  rakia.(none):/home/kgeorge/mysql/autopush/B21086-5.0-opt