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

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


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged