into mysql.com:/home/my/mysql-4.1


libmysqld/lib_sql.cc:
  Auto merged
sql/sql_class.h:
  Auto merged