Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50

into  siva.hindu.god:/usr/home/tim/m/bk/inno/51


storage/innobase/handler/ha_innodb.cc:
  null merge (use local)