Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


mysql-test/r/ndb_bug26793.result:
  Auto merged
mysql-test/t/ndb_bug26793.test:
  Auto merged