From de1dcee97e34f43b810a9329479e7e68b120eb55 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Feb 2005 17:34:02 +0100 Subject: after merge fixes --- mysql-test/t/strict.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/t/strict.test') diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index 2c15edb5fc3..15373f59149 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -569,12 +569,12 @@ DROP TABLE t1; CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6)); INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello ', 'hello '); ---error 1400 +--error 1406 INSERT INTO t1 (col1) VALUES ('hellobob'); --error 1265 INSERT INTO t1 (col2) VALUES ('hellobob'); INSERT INTO t1 (col2) VALUES ('hello '); ---error 1400 +--error 1406 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he'; --error 1265 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he'; -- cgit v1.2.1