Commit 7f20fe50 authored by unknown's avatar unknown
Browse files

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 

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


storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
parents 1c64c0fa 23c33249

There are no changes