Applied 9680.patch (by Osku Salerma)

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree

The idea of this merge is to "synchronize" 5.1-release tree (5.1.6) and
the main 5.1 tree. A patch for BUG#15588/BUG#16621 was copied into
5.1-release from 5.0 since it is important. This patch is expected to
come into the 5.1 tree after resolving 5.0 -> 5.1 megrge logjam.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  mysql.com:/home/dlenev/src/mysql-5.1-merges

    Copied from the general tree, to solve a build problem:
    ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
      build fix when building with example storage engine.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

    enable extra logging in ndb handler during test runs

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  mysql.com:/home/dlenev/src/mysql-5.1-bfix

privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

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

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge

into  mysql.com:/usr/home/bar/mysql-5.1.new.ctype