bzr push into mysql-5.5-cluster branch (jonas.oreland:3460 to 3461)

[Jonas Oreland]

 3461 Jonas Oreland	2011-09-05
      ndb - fix ndb_read_multi_range normal vs. ps-protocol

    modified:
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
 3460 Jonas Oreland	2011-09-05
      ndb - update 5.5 version to 7.2.1

    modified:
      VERSION
      mysql-test/suite/ndb/my.cnf
      mysql-test/suite/ndb/r/ndb_blob_big.result
      mysql-test/suite/ndb/r/ndb_dd_alter.result
      mysql-test/suite/ndb/t/ndb_blob_big.test
      storage/ndb/VERSION
=== modified file 'mysql-test/suite/ndb/r/ndb_read_multi_range.result'
--- a/mysql-test/suite/ndb/r/ndb_read_multi_range.result	2011-06-28 19:51:11 +0000
+++ b/mysql-test/suite/ndb/r/ndb_read_multi_range.result	2011-09-05 14:12:11 +0000
@@ -11,6 +11,7 @@ insert into t1 values
 (9,2,8),(10,3,7),(11,4,6),(12,5,5);
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
 2
+set autocommit=off;
 create table r1 as select * from t1 where a in (2,8,12);
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
 2
@@ -77,7 +78,7 @@ a	b	c
 8	5	9
 12	5	5
 drop table r1;
-select * from t1 where b in (1,33,5) order by a;
+select * from t1 force index(b) where b in (1,33,5) order by a;
 a	b	c
 4	5	4
 8	5	9
@@ -86,20 +87,20 @@ a	b	c
 1
 create table r1 as select * from t1 where b in (45,1,33,5,44);
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
-2
+3
 select * from r1 order by a;
 a	b	c
 4	5	4
 8	5	9
 12	5	5
 drop table r1;
-select * from t1 where b in (45,22) order by a;
+select * from t1 force index(b) where b in (45,22) order by a;
 a	b	c
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
 1
 create table r1 as select * from t1 where c in (2,8,33);
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
-2
+3
 select * from r1 order by a;
 a	b	c
 2	3	2
@@ -156,6 +157,7 @@ a	b	c
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
 1
 drop table t1;
+set autocommit=on;
 create table t1 (
 a int not null,
 b int not null,

=== modified file 'mysql-test/suite/ndb/t/ndb_read_multi_range.test'
--- a/mysql-test/suite/ndb/t/ndb_read_multi_range.test	2011-06-23 06:59:40 +0000
+++ b/mysql-test/suite/ndb/t/ndb_read_multi_range.test	2011-09-05 14:12:11 +0000
@@ -21,6 +21,16 @@ insert into t1 values
   (9,2,8),(10,3,7),(11,4,6),(12,5,5);
 --source suite/ndb/include/ndb_execute_count.inc
 
+##
+# In ps-protocol, server will adds calls to execute(Commit)
+#   (these are optimized away by ndbapi, since there is nothing to commit)
+#   and these generates a diff in execute-count
+# To not have to investigate problem futher, I simply set autocommit=off
+#   (and back further down where we don't track execute-count any longer)
+# It would probably be good to changes these tests to instead use frazers new
+#   ndbapi counters, and instead measure #round-trips
+set autocommit=off;
+
 # batch on primary key
 --source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where a in (2,8,12);
@@ -68,7 +78,7 @@ create table r1 as select * from t1 wher
 select * from r1 order by a;
 drop table r1;
 --source suite/ndb/include/ndb_init_execute_count.inc
-select * from t1 where b in (1,33,5) order by a;
+select * from t1 force index(b) where b in (1,33,5) order by a;
 --source suite/ndb/include/ndb_execute_count.inc
 --source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where b in (45,1,33,5,44);
@@ -76,7 +86,7 @@ create table r1 as select * from t1 wher
 select * from r1 order by a;
 drop table r1;
 --source suite/ndb/include/ndb_init_execute_count.inc
-select * from t1 where b in (45,22) order by a;
+select * from t1 force index(b) where b in (45,22) order by a;
 --source suite/ndb/include/ndb_execute_count.inc
 
 # batch on unique hash index, missing values
@@ -108,6 +118,8 @@ select * from t1 where c in (13,2,8,33,1
 --source suite/ndb/include/ndb_execute_count.inc
 drop table t1;
 
+set autocommit=on;
+
 #
 # Somewhat more complicated
 #

No bundle (reason: useless for push emails).