into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 scripts/mysql_install_db.sh: Auto merged sql/sql_update.cc: Auto merged