diff options
| author | bar@mysql.com/bar.intranet.mysql.r18.ru <> | 2006-09-29 16:40:18 +0500 |
|---|---|---|
| committer | bar@mysql.com/bar.intranet.mysql.r18.ru <> | 2006-09-29 16:40:18 +0500 |
| commit | 07f9efd1e1a0ec4177f05356cedc492f41e7b888 (patch) | |
| tree | f277bf716cf93d59092787fe0890a03fb85c99b5 /mysql-test/r/strict.result | |
| parent | 8b0f82b9b8ae8a892e67a55dd3dc10154a4cef00 (diff) | |
| parent | 29bc5cc179bf0d8d88986f0252d9f636c4bb47ea (diff) | |
| download | mariadb-git-07f9efd1e1a0ec4177f05356cedc492f41e7b888.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2
into mysql.com:/usr/home/bar/mysql-5.0.b6147rpl
Diffstat (limited to 'mysql-test/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index e144eed92f5..291cc6777e3 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -619,9 +619,9 @@ ERROR 22012: Division by 0 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0; ERROR 22012: Division by 0 INSERT INTO t1 (col1) VALUES (''); -ERROR 22003: Out of range value adjusted for column 'col1' at row 1 +ERROR HY000: Incorrect integer value: '' for column 'col1' at row 1 INSERT INTO t1 (col1) VALUES ('a59b'); -ERROR 22003: Out of range value adjusted for column 'col1' at row 1 +ERROR HY000: Incorrect integer value: 'a59b' for column 'col1' at row 1 INSERT INTO t1 (col1) VALUES ('1a'); ERROR 01000: Data truncated for column 'col1' at row 1 INSERT IGNORE INTO t1 (col1) VALUES ('2a'); @@ -701,9 +701,9 @@ ERROR 22012: Division by 0 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0; ERROR 22012: Division by 0 INSERT INTO t1 (col1) VALUES (''); -ERROR 22003: Out of range value adjusted for column 'col1' at row 1 +ERROR HY000: Incorrect integer value: '' for column 'col1' at row 1 INSERT INTO t1 (col1) VALUES ('a59b'); -ERROR 22003: Out of range value adjusted for column 'col1' at row 1 +ERROR HY000: Incorrect integer value: 'a59b' for column 'col1' at row 1 INSERT INTO t1 (col1) VALUES ('1a'); ERROR 01000: Data truncated for column 'col1' at row 1 INSERT IGNORE INTO t1 (col1) VALUES ('2a'); |