Commit 8db7aebc authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
parents 87e96633 6e4fff3f

mysql-test/lib/mtr_cases.pl

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ our @tags= 
 ["include/have_ndb.inc", "ndb_test", 1],

 ["include/have_multi_ndb.inc", "ndb_test", 1],

 ["include/have_ndb_extra.inc", "ndb_extra", 1],

 ["include/ndb_master-slave.inc", "ndb_test", 1],

 ["require_manager", "require_manager", 1],

);

mysql-test/mysql-test-run.pl

+11 −4
Original line number Diff line number Diff line
@@ -409,13 +409,20 @@ sub main () { 
    {

      # use default and add any extra_suites as defined

      $opt_suites= $opt_suites_default;

      my $ddd= basename(dirname($glob_mysql_test_dir));

      my $ccc= dirname($glob_mysql_test_dir);

      my $found= 0;

      while (!$found and !($ccc eq "/") and !($ccc eq ""))

      {

	my $ddd= basename($ccc);

	foreach my $extra_suite (@extra_suites)

	{

	  if ($extra_suite->[0] eq "$ddd")

	  {

	    $opt_suites= "$extra_suite->[1],$opt_suites";

	    $found= 1;

	  }

	}

	$ccc= dirname($ccc);

      }

    }

mysql-test/suite/ndb/r/ndb_partition_key.result

+17 −0
Original line number Diff line number Diff line
@@ -38,6 +38,23 @@ a b c 
1	10	3

1	11	3

1	12	3

select max(b) from t1 where a = 1;

max(b)

12

select b from t1 where a = 1 order by b desc;

b

12

11

10

9

8

7

6

5

4

3

2

1

DROP TABLE t1;

CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,

PRIMARY KEY (a,b,c) USING HASH)

mysql-test/suite/ndb/r/ndb_partition_range.result

+8 −0
Original line number Diff line number Diff line
@@ -46,6 +46,14 @@ a b c 
1	1	1

6	1	1

10	1	1

INSERT into t1 values (1, 2, 2);

select max(b) from t1 where a = 1;

max(b)

2

select b from t1 where a = 1 order by b desc;

b

2

1

drop table t1;

CREATE TABLE t1 (

a int not null,

mysql-test/suite/ndb/t/ndb_partition_key.test

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ insert into t1 values 


select * from t1 order by b;



# BUG#33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition

select max(b) from t1 where a = 1;

select b from t1 where a = 1 order by b desc;



DROP TABLE t1;



#