diff options
| author | ram@gw.mysql.r18.ru <> | 2005-01-19 12:04:35 +0400 |
|---|---|---|
| committer | ram@gw.mysql.r18.ru <> | 2005-01-19 12:04:35 +0400 |
| commit | c24c023e8c25962d3f6fc30147445469a62736f5 (patch) | |
| tree | 738f7cc58c4e81b16b532888abd1f92ea470a8c8 /mysql-test | |
| parent | a8e6b5e68c58e4c0450b3981eeabc4f9fb489b38 (diff) | |
| download | mariadb-git-c24c023e8c25962d3f6fc30147445469a62736f5.tar.gz | |
A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/strict.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/strict.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index fb228d37da3..c8f8006b992 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -814,14 +814,14 @@ DROP TABLE t1; CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6)); INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello ', 'hello '); INSERT INTO t1 (col1) VALUES ('hellobob'); -ERROR 01000: Data truncated for column 'col1' at row 1 +ERROR 22001: Data too long 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 +ERROR 22001: Data too long for column 'col1' at row 2 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he'; ERROR 01000: Data truncated for column 'col2' at row 2 INSERT IGNORE INTO t1 VALUES ('hellobob', 'hellobob'); diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index a0cfc0c60f4..e9612dd5729 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -565,12 +565,12 @@ DROP TABLE t1; CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6)); INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello ', 'hello '); ---error 1265 +--error 1400 INSERT INTO t1 (col1) VALUES ('hellobob'); --error 1265 INSERT INTO t1 (col2) VALUES ('hellobob'); INSERT INTO t1 (col2) VALUES ('hello '); ---error 1265 +--error 1400 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he'; --error 1265 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he'; |