into mysql.com:/Users/kent/mysql/bk/mysql-5.0


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_open.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged