diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2005-01-19 12:05:59 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2005-01-19 12:05:59 +0400 |
| commit | e0cb84fd5f129e6fffa9b50983eb7956b0484482 (patch) | |
| tree | f2489776ba5a06cabc848769a1b9c76dafa83da5 /mysql-test/r/strict.result | |
| parent | bfe74e69903583f1bb9b4ad803c137d6487afa74 (diff) | |
| parent | af5778538db5694f3bec965e1bc95e4d883dceee (diff) | |
| download | mariadb-git-e0cb84fd5f129e6fffa9b50983eb7956b0484482.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
mysql-test/r/strict.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index f28317ce947..72a763db1b1 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'); |