into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup


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