Commit 2e5f50d6 authored by unknown's avatar unknown

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint

into  trift2.:/MySQL/M51/push-5.1


sql/sql_parse.cc:
  Auto merged
parents 6f88aa45 4e17077b
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment