summaryrefslogtreecommitdiff
path: root/mysql-test/t/strict.test
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-02-16 17:34:02 +0100
committerunknown <serg@serg.mylan>2005-02-16 17:34:02 +0100
commitde1dcee97e34f43b810a9329479e7e68b120eb55 (patch)
tree035ac3e99dc2b1a103e3b2fd04896b2e3ef10421 /mysql-test/t/strict.test
parent2d8b51991cb5d639254786edb6c446adbd4eb31c (diff)
downloadmariadb-git-de1dcee97e34f43b810a9329479e7e68b120eb55.tar.gz
after merge fixes
Diffstat (limited to 'mysql-test/t/strict.test')
-rw-r--r--mysql-test/t/strict.test4
1 files changed, 2 insertions, 2 deletions
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';