into  mysql.com:/home/hf/work/19491/my50-19491


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged