into  mysql.com:/d2/hf/common/my51-common


libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged