into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged