into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
sql/share/errmsg.txt:
  Manual merge.