Commit 512ad385 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
parents bb6346fd 2965c480

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

+24 −0
Original line number Diff line number Diff line
@@ -869,6 +869,30 @@ a b 
3	30

4	1

drop table t1,t2;

create table t1 (a varchar(100) primary key, b varchar(100)) engine = NDB;

insert into t1 values

('a', 'a'),('b','b'),('c', 'c'),('aa', 'aa'),('bb', 'bb'),('cc', 'cc');

replace into t1 values ('a', '-a');

replace into t1 values ('b', '-b');

replace into t1 values ('c', '-c');

replace into t1 values ('aa', '-aa');

replace into t1 values ('bb', '-bb');

replace into t1 values ('cc', '-cc');

replace into t1 values ('aaa', '-aaa');

replace into t1 values ('bbb', '-bbb');

replace into t1 values ('ccc', '-ccc');

select * from t1 order by 1,2;

a       b

a       -a

aa      -aa

aaa     -aaa

b       -b

bb      -bb

bbb     -bbb

c       -c

cc      -cc

ccc     -ccc

drop table t1;

End of 5.0 tests

CREATE TABLE t1 (a VARCHAR(255) NOT NULL,

CONSTRAINT pk_a PRIMARY KEY (a))engine=ndb;

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

+20 −2
Original line number Diff line number Diff line
@@ -800,9 +800,27 @@ update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3; 
select * from t1 order by a;

drop table t1,t2;



# End of 5.0 tests

--echo End of 5.0 tests

#

# Bug#31635

#

create table t1 (a varchar(100) primary key, b varchar(100)) engine = NDB;

insert into t1 values

  ('a', 'a'),('b','b'),('c', 'c'),('aa', 'aa'),('bb', 'bb'),('cc', 'cc');

replace into t1 values ('a', '-a');

replace into t1 values ('b', '-b');

replace into t1 values ('c', '-c');



replace into t1 values ('aa', '-aa');

replace into t1 values ('bb', '-bb');

replace into t1 values ('cc', '-cc');



replace into t1 values ('aaa', '-aaa');

replace into t1 values ('bbb', '-bbb');

replace into t1 values ('ccc', '-ccc');

select * from t1 order by 1,2;

drop table t1;



--echo End of 5.0 tests



#

# Bug #18483 Cannot create table with FK constraint