Post-merge fixes.

Fix to allow the binlog format to be changed between the LOCK and
UNLOCK tables, as well as under MIXED mode.

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

 Fixing test result.

 the usable range to 0..1000 (0 disables the thread throttling).

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.

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

 Changes in SQL parser:
 * Change default mode of SELECT from "lock in share mode"
   to "consistent read".
 * Remove support from SELECT for specifying "consistent read".
 * Add support in SELECT for specifying "lock in share mode".
 * Change all uses of SQL parser to specify "lock in share mode".
 * Modify syntax so that the only valid top-level statement is
   a procedure definition, since it's the only one that actually
   works.
 * Add support for lock waits.