Commit a3a52884 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug17233/my50-bug17233 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 545dbd8e 4b114615

mysql-test/r/ndb_load.result

+2 −2
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;

LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;

ERROR 23000: Can't write; duplicate key in table 't1'

DROP TABLE t1;

CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;

LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;

SELECT * FROM t1 ORDER BY word;

word

Aarhus

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -12,4 +12,3 @@ 


sp-goto         : GOTO is currently is disabled - will be fixed in the future

subselect       : Bug#15706
 
ndb_load        : Bug #17233

mysql-test/t/ndb_load.test

+2 −2
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ DROP TABLE IF EXISTS t1; 
# should give duplicate key

CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;

--error 1022

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;

LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;

DROP TABLE t1;



# now without a primary key we should be ok

CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;

LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;

SELECT * FROM t1 ORDER BY word;

DROP TABLE t1;