Merge InnoDB patch from MySQL 5.1.47:

revno: 2661.607.39
revision-id: marko.makela@oracle.com-20100420201550-cax1xywvlcdshgfg
parent: marko.makela@oracle.com-20100420114222-diq7h2hiom9ww6me
committer: Marko Makela <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 23:15:50 +0300
message:
  btr_cur_optimistic_insert(): Remove unused variable "heap".
modified:
  storage/innodb_plugin/btr/btr0cur.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c