Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-opt
unknown authored
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-opt-merge


mysql-test/r/sp-code.result:
  Auto merged
mysql-test/t/sp-code.test:
  Auto merged
523f3a02