into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam sql/handler.cc: Auto merged configure.in: merge 5.0-bugteam to 5.1-bugteam