Commit 9a15154f authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
parents e7340d5c f523685c

mysql-test/r/ndb_dd_advance2.result

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ end if; 
end//

insert into test.t1 (a1) values (1)//

insert into test.t1 (a1,a2) values (2, 'ccccccc')//

select * from test.t1//

select * from test.t1 order by a1//

a1	a2	a3

1	trg1 works on a2 field	trg1 works on a3 field

2	ccccccc	trg1 works on a3 field

mysql-test/t/ndb_dd_advance2.test

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ delimiter //; 
 end//

 insert into test.t1 (a1) values (1)//

 insert into test.t1 (a1,a2) values (2, 'ccccccc')//

 select * from test.t1//

 select * from test.t1 order by a1//

 delimiter ;//

 

 DELETE FROM test.t1;