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

into moonbone.local:/home/evgen/mysql-5.1-new

into  xiphis.org:/home/antony/work2/p4-bug12096.3-merge

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

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

into  mysql.com:/home/stewart/Documents/MySQL/5.1/bug20725

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge

into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge

change default minimum to 3

bug is *very* timing dependent, unable to reproduce here, but theoretically possible.

  50->51 merge of bug#20442, force close scan (with locks)

  ndbapi test of bug#20252

into  perch.ndb.mysql.com:/home/jonas/src/51-work

  force close of scan (of outstanding scan_frag)

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge

into mysql.com:/home/gluh/MySQL/Merge/5.1-kt

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

- make sure to invalidate even if table is not binlogged

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

into mysql.com:/home/gluh/MySQL/Merge/5.1-kt

  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
  new file

into  mysql.com:/data0/mysql-5.1

  Adding back ndb partition tests from mysql-test-extra per tomas and clavin
  new file

fix based on review by tomas.

conform to bug we haven't fixed yet.

Post recent handler changes, fast count(*) for cluster was broken.

Seeing as we maintain an exact count for ndb, we can easily use this for an optimisation.

With this patch, and use_exact_count DISABLED, we will use the fast way
of getting count(*) but not use the exact count for the optimiser.

With this patch and use_exact_count ENABLED, we will use the fast way of
getting count(*) and use the exact count for the optimiser.

into mysql.com:/home/gluh/MySQL/Merge/5.1-kt

- post merge fixes for 5.1

- post merge fixes for 5.1

into mysql.com:/home/hf/work/mysql-5.1.clean

into  perch.ndb.mysql.com:/home/jonas/src/51-work

  allow user to specify scan batch size in readTuples

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

- correction of previous patch

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

- make sure to allocate just enough pages in the fragments by using the actual
  row count from the backup, to avoid over allocation of pages to fragments, and
  thus avoid the bug

into  mysql.com:/opt/local/work/mysql-5.1-runtime