From 8c71efbcd45fd625cfb8cd6f893642d0b69f3069 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Jan 2005 23:28:57 +0400 Subject: [PATCH] strict.result, strict.test: Clean-up for the previous change: VARCHAR and trailing spaces. mysql-test/t/strict.test: Clean-up for the previous change: VARCHAR and trailing spaces. mysql-test/r/strict.result: Clean-up for the previous change: VARCHAR and trailing spaces. --- mysql-test/r/strict.result | 2 ++ mysql-test/t/strict.test | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index f0f7ed9684e..fb228d37da3 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -818,6 +818,8 @@ ERROR 01000: Data truncated for column 'col1' at row 1 INSERT INTO t1 (col2) VALUES ('hellobob'); ERROR 01000: Data truncated for column 'col2' at row 1 INSERT INTO t1 (col2) VALUES ('hello '); +Warnings: +Note 1265 Data truncated for column 'col2' at row 1 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he'; ERROR 01000: Data truncated for column 'col1' at row 2 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he'; diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index 4711934b9fd..a0cfc0c60f4 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -569,7 +569,6 @@ INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello ', 'hello '); INSERT INTO t1 (col1) VALUES ('hellobob'); --error 1265 INSERT INTO t1 (col2) VALUES ('hellobob'); ---error 1265 INSERT INTO t1 (col2) VALUES ('hello '); --error 1265 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he';