into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint


sql/sql_parse.cc:
  Auto merged