into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0 Docs/manual.texi: Auto merged sql/sql_select.cc: Auto merged