into  trift2.:/MySQL/M51/bug26609-5.1


Makefile.am:
  Manual merge: Include the "row_lock" suite in the "test-bt" target.
scripts/make_binary_distribution.sh:
  Manual merge: Include the additional test suites in the binary package.