into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/item_func.cc:
  Auto merged
sql/slave.cc:
  Auto merged