Merge siva.hindu.god:/home/tsmith/m/inno/apr18/50

into  siva.hindu.god:/home/tsmith/m/inno/apr18/51


BitKeeper/deleted/.del-configure.in:
  Use local
mysql-test/r/innodb.result:
  Use local
mysql-test/t/innodb.test:
  Use local
mysys/my_alloc.c:
  SCCS merged
sql/ha_ndbcluster.cc:
  SCCS merged
sql/item.cc:
  SCCS merged
sql/item_cmpfunc.cc:
  SCCS merged
sql/mysqld.cc:
  SCCS merged
sql/sql_delete.cc:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  Use local
storage/innobase/handler/ha_innodb.h:
  Use local
storage/innobase/os/os0file.c:
  Use local