into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint sql/sql_analyse.cc: Auto merged vio/viosslfactories.c: Auto merged