Commit 31d5fc50 authored by unknown's avatar unknown

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

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


sql/ha_ndbcluster.cc:
  manual merge af packported code to 5.0, use local copy
sql/handler.h:
  manual merge af packported code to 5.0, use local copy
sql/sql_update.cc:
  manual merge af packported code to 5.0, use local copy
parents 767ff946 5dab95e2
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