into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin

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.

 - 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  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)

Emit an error instead of doing ASSERT

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

into  chilla.local:/home/mydev/mysql-5.1-amerge

(well, im_options in this case, but using existing bug report)

into  willster.(none):/home/stewart/Documents/MySQL/5.1/main

Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

Test case fix

into  dator5.(none):/home/pappa/bug20733

into  dator5.(none):/home/pappa/bug20733

 - Disable test case until fixed

 - Only handle return codes from 'pclose' greater than zero as errors.
 - It appears pclose can return -1 with errno set to ECHILD although the executin
process completed successfully. 

into  chilla.local:/home/mydev/mysql-5.1-amain