Commit 721541b6 authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files

Merge stella.local:/home2/mydev/mysql-5.0-bug32705 

into  stella.local:/home2/mydev/mysql-5.0-axmrg
parents ad502388 b53d161c

mysql-test/r/ctype_ucs2_def.result

+10 −0
Original line number Diff line number Diff line
@@ -21,4 +21,14 @@ INSERT INTO t1 VALUES('A', 'A'), ('B', 'B'), ('C', 'C'); 
INSERT INTO t1 VALUES('A ', 'A ');

ERROR 23000: Duplicate entry '' for key 1

DROP TABLE t1;

CREATE TABLE t1 (

c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,

KEY(c1)

) ENGINE=MyISAM;

INSERT INTO t1 VALUES ('marshall\'s');

INSERT INTO t1 VALUES ('marsh');

CHECK TABLE t1 EXTENDED;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/myisam.result

+0 −10
Original line number Diff line number Diff line
@@ -1839,16 +1839,6 @@ CHECK TABLE t1 EXTENDED; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

CREATE TABLE t1 (

c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,

KEY(c1)

) ENGINE=MyISAM;

INSERT INTO t1 VALUES ('marshall\'s');

INSERT INTO t1 VALUES ('marsh');

CHECK TABLE t1 EXTENDED;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

CREATE TABLE t1 (id int NOT NULL, ref int NOT NULL, INDEX (id)) ENGINE=MyISAM;

CREATE TABLE t2 LIKE t1;

INSERT INTO t2 (id, ref) VALUES (1,3), (2,1), (3,2), (4,5), (4,4);

mysql-test/t/ctype_ucs2_def.test

+13 −0
Original line number Diff line number Diff line
@@ -39,4 +39,17 @@ INSERT INTO t1 VALUES('A', 'A'), ('B', 'B'), ('C', 'C'); 
INSERT INTO t1 VALUES('A ', 'A ');

DROP TABLE t1;



#

# Bug#32705 - myisam corruption: Key in wrong position

#             at page 1024 with ucs2_bin

#

CREATE TABLE t1 (

  c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,

  KEY(c1)

  ) ENGINE=MyISAM;

INSERT INTO t1 VALUES ('marshall\'s');

INSERT INTO t1 VALUES ('marsh');

CHECK TABLE t1 EXTENDED;

DROP TABLE t1;



--echo End of 5.0 tests

mysql-test/t/myisam.test

+0 −13
Original line number Diff line number Diff line
@@ -1193,19 +1193,6 @@ SET @@myisam_repair_threads=1; 
CHECK TABLE t1 EXTENDED;

DROP TABLE t1;



#

# Bug#32705 - myisam corruption: Key in wrong position

#             at page 1024 with ucs2_bin

#

CREATE TABLE t1 (

  c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,

  KEY(c1)

  ) ENGINE=MyISAM;

INSERT INTO t1 VALUES ('marshall\'s');

INSERT INTO t1 VALUES ('marsh');

CHECK TABLE t1 EXTENDED;

DROP TABLE t1;



#

# Bug#28837: MyISAM storage engine error (134) doing delete with self-join

#