Commit 5e1078b6 authored by unknown's avatar unknown

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/mysqld.cc:
  Auto merged
parents 127373be a3fed7de
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