Addded test files for NDB

Updated stop_ndbcluster script

mysql-test/ndb/stop_ndbcluster

@@ -22,9 +22,9 @@ done
 
 stop_default_ndbcluster() {
 
-if [ ! -f $pidfile ] ; then
-  exit 0
-fi
+#if [ ! -f $pidfile ] ; then
+#  exit 0
+#fi
 
 if [ ! -f $cfgfile ] ; then
   echo "$cfgfile missing"
@@ -43,8 +43,11 @@ echo "all stop" | $exec_mgmtclient
 
 sleep 5
 
-kill `cat $pidfile`
-rm $pidfile
+if [ -f $pidfile ] ; then
+  kill `cat $pidfile`
+  rm $pidfile
+fi
+
 }
 
 stop_default_ndbcluster

mysql-test/r/ndb_index_ordered.result

@@ -119,3 +119,72 @@ select * from t1 order by a;
 a	b	c
 4	5	12
 drop table t1;
+CREATE TABLE t1 (
+a int unsigned NOT NULL PRIMARY KEY,
+b int unsigned not null,
+c int unsigned not null,
+) engine = ndb;
+create index a1 on t1 (b, c);
+insert into t1 values (1, 2, 13);
+insert into t1 values (2,3, 13);
+insert into t1 values (3, 4, 12);
+insert into t1 values (4, 5, 12);
+insert into t1 values (5,6, 12);
+insert into t1 values (6,7, 12);
+insert into t1 values (7, 2, 1);
+insert into t1 values (8,3, 6);
+insert into t1 values (9, 4, 12);
+insert into t1 values (14, 5, 4);
+insert into t1 values (15,5,5);
+insert into t1 values (16,5, 6);
+insert into t1 values (17,4,4);
+insert into t1 values (18,1, 7);
+select * from t1 order by a;
+a	b	c
+1	2	13
+2	3	13
+3	4	12
+4	5	12
+5	6	12
+6	7	12
+7	2	1
+8	3	6
+9	4	12
+14	5	4
+15	5	5
+16	5	6
+17	4	4
+18	1	7
+select * from t1 where b<=5 order by a;
+a	b	c
+1	2	13
+2	3	13
+3	4	12
+4	5	12
+7	2	1
+8	3	6
+9	4	12
+14	5	4
+15	5	5
+16	5	6
+17	4	4
+18	1	7
+select * from t1 where b<=5 and c=0;
+a	b	c
+insert into t1 values (19,4, 0);
+select * from t1 where b<=5 and c=0;
+a	b	c
+19	4	0
+select * from t1 where b=4 and c<=5;
+a	b	c
+19	4	0
+17	4	4
+select * from t1 where b<=4 and c<=5 order by a;
+a	b	c
+7	2	1
+17	4	4
+19	4	0
+select * from t1 where b<=5 and c=0 or b<=5 and c=2;
+a	b	c
+19	4	0
+drop table t1;

mysql-test/t/ndb_index_ordered.test

@@ -32,7 +32,7 @@ select * from t1 where b <= 4 order by b;
 # Update using ordered index scan
 #
 
-# MASV update t1 set c = 3 where b = 3;
+update t1 set c = 3 where b = 3;
 select * from t1 order by a;
 update t1 set c = 10 where b >= 6;
 select * from t1 order by a;
@@ -59,7 +59,7 @@ CREATE TABLE t1 (
 
 insert t1 values(1, 2, 13), (2,3, 13), (3, 4, 12), (4, 5, 12), (5,6, 12), (6,7, 12);
 
-# MASV delete from t1 where b = 3;
+delete from t1 where b = 3;
 select * from t1 order by a;
 delete from t1 where b >= 6;
 select * from t1 order by a;
@@ -97,11 +97,16 @@ insert into t1 values (14, 5, 4);
 insert into t1 values (15,5,5);
 insert into t1 values (16,5, 6);
 insert into t1 values (17,4,4);
+insert into t1 values (18,1, 7);
+
+
 
 select * from t1 order by a;
-select * from t1 where b<=5;
-#select * from t1 where b<=5 and c=0;
-#select * from t1 where b=4 and c<=5;
-select * from t1 where b<=4 and c<=5;
-# MASV select * from t1 where b<=5 and c=0 or b<=5 and c=2;
+select * from t1 where b<=5 order by a;
+select * from t1 where b<=5 and c=0;
+insert into t1 values (19,4, 0);
+select * from t1 where b<=5 and c=0;
+select * from t1 where b=4 and c<=5;
+select * from t1 where b<=4 and c<=5 order by a;
+select * from t1 where b<=5 and c=0 or b<=5 and c=2;
 drop table t1;