Commit 25134e2b authored by unknown's avatar unknown

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/sql_update.cc:
  Auto merged
parents 20e33196 157a13fb
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