Merge xiphis.org:/home/antony/work2/mysql-5.0-merge

into  xiphis.org:/home/antony/work2/mysql-5.1-merge


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged