into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2


mysql-test/r/federated.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
sql/sql_base.cc:
  Auto merged