into  mysql.com:/home/mydev/mysql-5.1-aid


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged