Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into mysql.com:/space/pekka/ndb/version/my50-ndb

mysql-test/ndb/ndb_range_bounds.pl

 #
 # test range scan bounds
 # give option --all to test all cases
+# set MYSQL_HOME to installation top
 #
 
 use strict;
@@ -14,8 +15,9 @@ my $opt_verbose = 0;
 GetOptions("all" => \$opt_all, "cnt=i" => \$opt_cnt, "verbose" => \$opt_verbose)
   or die "options are:  --all --cnt=N --verbose";
 
-my $mysql_top = $ENV{MYSQL_TOP};
-my $dsn = "dbi:mysql:database=test;host=localhost;mysql_read_default_file=$mysql_top/.target/var/my.cnf";
+my $mysql_home = $ENV{MYSQL_HOME};
+defined($mysql_home) or die "no MYSQL_HOME";
+my $dsn = "dbi:mysql:database=test;host=localhost;mysql_read_default_file=$mysql_home/var/my.cnf";
 my $opts = { RaiseError => 0, PrintError => 0, AutoCommit => 1, };
 
 my $dbh;

mysql-test/r/ndb_index_ordered.result

@@ -383,6 +383,7 @@ b	c
 select min(b), max(b) from t1;
 min(b)	max(b)
 1	5000000
+drop table t1;
 CREATE TABLE test1 (
 SubscrID int(11) NOT NULL auto_increment,
 UsrID int(11) NOT NULL default '0',

mysql-test/t/ndb_index_ordered.test

@@ -175,6 +175,8 @@ select b, c from t1 where 1000<=b and b<=100000 and c<'j' order by b, c;
 select b, c from t1 where 1000<=b and b<=100000 and c<'j' order by b desc, c desc;
 #
 select min(b), max(b) from t1;
+#
+drop table t1;
 
 #
 # Bug #6435