Commit 6ec04a6a authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0


sql/sql_parse.cc:
  Auto merged
parents b3d84a68 7684e100

There are no changes