into volk.internalnet:/home/tonu/mysql-4.0


sql/item_strfunc.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged