Commit 9cd3181d authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
parents 31871254 db0f1ce6

There are no changes