Commit 3cc91604 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged
parents 4bb2c162 34c55867

There are no changes