into  weblab.(none):/home/marcsql/TREE/mysql-5.1-8407-merge


sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_base.cc:
  Manual merge