MYSQL_STORAGE_ENGINE macro (and nowhere else)

into  april.(none):/home/svoj/devel/mysql/mysql-5.1-new

into  april.(none):/home/svoj/devel/mysql/mysql-5.1-new

  t4 was not dropped, which made the "backup" test fail
  if one of the previous tests using t4 (e.g. "archive") failed.

into mysql.com:/M51/mysql-5.1

Fixed that --plugin_dir option doesn't work.
Fixed that parser name is not restored correctly from the table.

into  mysql.com:/home/mydev/mysql-5.1-bug15591

into  zim.(none):/home/brian/mysql/slap-5.1

Added option --lock-directory so that you can now syncronize several mysqlslap processes across several machines. Not perfect yet.

Added --slave option if you are trying to syncronize around one server using the lock-directory option plus NFS. 

Added options to allow you to run several concurrency runs in one call. aka --concurrency="1, 8, 64, 128"

Time collection is now done in a finer grain manner, and is linked to the sync call (doesn't count the cost of the blocked processes that are setup to run).

into  devsrv-b.mysql.com:/space/magnus/my51-bug15775_part2

If the server is started with --port-open-timeout=# 
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.

into moonbone.local:/work/14583-bug-5.1-new-mysql

into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2

 - Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified

into moonbone.local:/work/14583-bug-4.1-mysql

Manual merge.

into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2

   - DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new

into  xiphis.org:/home/antony/work2/p4-bug15976

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/space/pekka/ndb/version/my50

into  mysql.com:/space/pekka/ndb/version/my51

When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

into  mysql.com:/home/mydev/mysql-4.1-bug5390

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/home/mydev/mysql-5.1-bug5390

into  mysql.com:/home/mydev/mysql-5.1-bug5390