bzr push into mysql-5.1-telco-7.0 branch (mauritz.sundell:4483 to 4485)

[Mauritz Sundell]

 4485 Mauritz Sundell	2011-08-28
      Regenerated (again) test result fro ndb_statistics1 with notes.
      
      Wrong result committed - stupid me.
      
      Three query plans changed but is equally good as the previous.
      A test related to bug #59519 seems broken even before the
      previus commit. The query plan should have >1 row in last join.
      
      In the same query the index for (I,J) should be choosen but
      in this case the resulting index (J,K) is equally good.

    modified:
      mysql-test/suite/ndb/r/ndb_statistics1.result
 4484 Mauritz Sundell	2011-08-28
      Regenerated test result fro ndb_statistics1 with notes.
      
      Three query plans changed but is equally good as the previous.
      A test related to bug #59519 seems broken even before the
      previus commit. The query plan should have >1 row in last join.
      
      In the same query the index for (I,J) should be choosen but
      in this case the resulting index (J,K) is equally good.

    modified:
      mysql-test/suite/ndb/r/ndb_statistics1.result
 4483 Mauritz Sundell	2011-08-28
      ndb - index statistics for partial keys of unique/primary ordered index

    modified:
      mysql-test/suite/ndb/r/ndb_index_stat.result
      mysql-test/suite/ndb/t/ndb_index_stat.test
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_statistics1.result'
--- a/mysql-test/suite/ndb/r/ndb_statistics1.result	2011-07-25 17:11:41 +0000
+++ b/mysql-test/suite/ndb/r/ndb_statistics1.result	2011-08-28 18:21:59 +0000
@@ -77,7 +77,7 @@ SELECT * FROM t10000 AS X JOIN t10000 AS
 ON Y.I=X.I AND Y.J = X.I;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	X	ALL	I	NULL	NULL	NULL	10000	
-1	SIMPLE	Y	ref	J,I	I	10	test.X.I,test.X.I	1	Using where
+1	SIMPLE	Y	ref	J,I	J	5	test.X.I	1	Using where
 EXPLAIN
 SELECT * FROM t100 WHERE k < 42;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -145,11 +145,11 @@ id	select_type	table	type	possible_keys
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0 AND K < 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	range	PRIMARY,J	PRIMARY	4	NULL	2	Using where with pushed condition
+1	SIMPLE	t10000	ref	PRIMARY,J	J	5	const	2	Using where with pushed condition
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0 AND K BETWEEN 1 AND 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t10000	range	PRIMARY,J	PRIMARY	4	NULL	2	Using where with pushed condition
+1	SIMPLE	t10000	ref	PRIMARY,J	J	5	const	2	Using where with pushed condition
 EXPLAIN
 SELECT * FROM t10000 WHERE J = 0 AND K = 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

No bundle (reason: useless for push emails).