Small corrections after a bad merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0

into  xiphis.org:/home/antony/work2/p2-bug20168.4

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002

into  xiphis.org:/home/antony/work2/p2-bug20168.4

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

- correction of backport error

- make sure to disable bulk insert when check for duplicate key is needed

into mysql.com:/M51/bug18810-5.1

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801

After review fix

After review fix

into  mysql.com:/home/marty/MySQL/mysql-5.1

into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1

into  mysql.com:/home/marty/MySQL/mysql-5.1

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

corrupt
  - add infinite retry on drop table temporary error

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

- add infinite retry on drop table temporary error

Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking

Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case