database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge 5.0->5.1. Post-merge fixes.

Browse Source
This commit is contained in:
kostja@bodhi.local
2006-08-14 13:27:11 +04:00
parent 04c97488f9
commit 5dfdc8bfce
30 changed files with 116 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/ndb_basic.result
View File

@ -749,7 +749,7 @@ f1 f2 f3
222222 bbbbbb 2
drop table t1;
Illegal ndb error code: 1186
Enf of 5.0 tests
End of 5.0 tests
CREATE TABLE t1 (a VARCHAR(255) NOT NULL,
CONSTRAINT pk_a PRIMARY KEY (a))engine=ndb;
CREATE TABLE t2(a VARCHAR(255) NOT NULL,
@ -758,3 +758,4 @@ c VARCHAR(255) NOT NULL,
CONSTRAINT pk_b_c_id PRIMARY KEY (b,c),
CONSTRAINT fk_a FOREIGN KEY(a) REFERENCES t1(a))engine=ndb;
drop table t1, t2;
End of 5.1 tests