Commit 2d803761 authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files

Merge bk@192.168.21.1:mysql-4.1 

into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
parents f6989772 fbed4826

mysql-test/r/alter_table.result

+5 −0
Original line number Diff line number Diff line
@@ -803,3 +803,8 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
alter table table_24562 order by no_such_col;

ERROR 42S22: Unknown column 'no_such_col' in 'order clause'

drop table table_24562;

CREATE TABLE t1 (c1 CHAR(255));

INSERT INTO t1 VALUES (REPEAT("x", 255)), (REPEAT("x", 255));

ALTER TABLE t1 ADD UNIQUE (c1);

ERROR 23000: Duplicate entry 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' for key 1

DROP TABLE t1;

mysql-test/r/heap.result

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ drop table t1; 
create table t1 (c char(255), primary key(c(90)));

insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1

ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1

drop table t1;

CREATE TABLE t1 (a int, key(a)) engine=heap;

insert into t1 values (0);

mysql-test/r/innodb_mysql.result

+33 −0
Original line number Diff line number Diff line
@@ -128,4 +128,37 @@ show /*!50002 GLOBAL */ status like 'Handler_rollback'; 
Variable_name	Value

Handler_rollback	0

drop table t1;

CREATE TABLE t1(c1 TEXT, UNIQUE (c1(1)), cnt INT DEFAULT 1)

ENGINE=INNODB CHARACTER SET UTF8;

INSERT INTO t1 (c1) VALUES ('1a');

SELECT * FROM t1;

c1	cnt

1a	1

INSERT INTO t1 (c1) VALUES ('1b') ON DUPLICATE KEY UPDATE cnt=cnt+1;

SELECT * FROM t1;

c1	cnt

1a	2

DROP TABLE t1;

CREATE TABLE t1(c1 VARCHAR(2), UNIQUE (c1(1)), cnt INT DEFAULT 1)

ENGINE=INNODB CHARACTER SET UTF8;

INSERT INTO t1 (c1) VALUES ('1a');

SELECT * FROM t1;

c1	cnt

1a	1

INSERT INTO t1 (c1) VALUES ('1b') ON DUPLICATE KEY UPDATE cnt=cnt+1;

SELECT * FROM t1;

c1	cnt

1a	2

DROP TABLE t1;

CREATE TABLE t1(c1 CHAR(2), UNIQUE (c1(1)), cnt INT DEFAULT 1)

ENGINE=INNODB CHARACTER SET UTF8;

INSERT INTO t1 (c1) VALUES ('1a');

SELECT * FROM t1;

c1	cnt

1a	1

INSERT INTO t1 (c1) VALUES ('1b') ON DUPLICATE KEY UPDATE cnt=cnt+1;

SELECT * FROM t1;

c1	cnt

1a	2

DROP TABLE t1;

End of 4.1 tests

mysql-test/t/alter_table.test

+11 −0
Original line number Diff line number Diff line
@@ -583,5 +583,16 @@ alter table table_24562 order by no_such_col; 


drop table table_24562;



#

# Bug #20710: adding unique index of column with duplicated

# long values to reproduce error message with truncated key value.

#



CREATE TABLE t1 (c1 CHAR(255));

INSERT INTO t1 VALUES (REPEAT("x", 255)), (REPEAT("x", 255));

--error 1062

ALTER TABLE t1 ADD UNIQUE (c1);

DROP TABLE t1;



# End of 4.1 tests

mysql-test/t/innodb_mysql.test

+30 −0
Original line number Diff line number Diff line
@@ -161,4 +161,34 @@ show /*!50002 GLOBAL */ status like 'Handler_rollback'; 
connection default;

drop table t1;

disconnect con1;



#

# Bug #13191: INSERT...ON DUPLICATE KEY UPDATE of UTF-8 string fields

# used in partial unique indices.

#



CREATE TABLE t1(c1 TEXT, UNIQUE (c1(1)), cnt INT DEFAULT 1)

  ENGINE=INNODB CHARACTER SET UTF8;

INSERT INTO t1 (c1) VALUES ('1a');

SELECT * FROM t1;

INSERT INTO t1 (c1) VALUES ('1b') ON DUPLICATE KEY UPDATE cnt=cnt+1;

SELECT * FROM t1;

DROP TABLE t1;



CREATE TABLE t1(c1 VARCHAR(2), UNIQUE (c1(1)), cnt INT DEFAULT 1)

  ENGINE=INNODB CHARACTER SET UTF8;

INSERT INTO t1 (c1) VALUES ('1a');

SELECT * FROM t1;

INSERT INTO t1 (c1) VALUES ('1b') ON DUPLICATE KEY UPDATE cnt=cnt+1;

SELECT * FROM t1;

DROP TABLE t1;



CREATE TABLE t1(c1 CHAR(2), UNIQUE (c1(1)), cnt INT DEFAULT 1)

  ENGINE=INNODB CHARACTER SET UTF8;

INSERT INTO t1 (c1) VALUES ('1a');

SELECT * FROM t1;

INSERT INTO t1 (c1) VALUES ('1b') ON DUPLICATE KEY UPDATE cnt=cnt+1;

SELECT * FROM t1;

DROP TABLE t1;



--echo End of 4.1 tests