Merge rurik.mysql.com:/home/igor/mysql-5.0

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/func_test.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged