into  mysql_cab_desk.:C:/source/C++/mysql-5.1-new-rpl


sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged