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

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


mysql-test/r/range.result:
  SCCS merged
sql/item.cc:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  Use local
storage/innobase/handler/ha_innodb.h:
  Use local