summaryrefslogtreecommitdiff
path: root/mysql-test/r/strict.result
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-05-13 13:22:27 +0500
committerunknown <ramil@mysql.com>2005-05-13 13:22:27 +0500
commitdba09923b730c0006af71c73012d98f3169bb448 (patch)
tree1293215185aee096bc0f5b518fffccdf90efa465 /mysql-test/r/strict.result
parent4acfc0b6111fb069cc718b6b87d821407190999e (diff)
downloadmariadb-git-dba09923b730c0006af71c73012d98f3169bb448.tar.gz
a fix (bug #6961: Traditional: assignment of string to numeric column should fail).
sql/field.cc: a fix (bug #6961: Traditional: assignment of string to numeric column should fail). Should issue errors in strict modes instead of warnings.
Diffstat (limited to 'mysql-test/r/strict.result')
-rw-r--r--mysql-test/r/strict.result6
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index 79be7a1923a..d7ad803b828 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -770,7 +770,7 @@ ERROR 22003: Out of range value adjusted for column 'col1' at row 1
INSERT INTO t1 VALUES ('-100E+1');
ERROR 22003: Out of range value adjusted for column 'col1' at row 1
INSERT INTO t1 VALUES ('-100E');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR HY000: Incorrect decimal value: '-100E' for column 'col1' at row 1
UPDATE t1 SET col1 =col1 * 50000 WHERE col1 =11;
ERROR 22003: Out of range value adjusted for column 'col1' at row 6
UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
@@ -782,8 +782,7 @@ ERROR HY000: Incorrect decimal value: '' for column 'col1' at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
ERROR HY000: Incorrect decimal value: 'a59b' for column 'col1' at row 1
INSERT INTO t1 (col1) VALUES ('1a');
-Warnings:
-Note 1265 Data truncated for column 'col1' at row 1
+ERROR HY000: Incorrect decimal value: '1a' for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
Warnings:
Note 1265 Data truncated for column 'col1' at row 1
@@ -818,7 +817,6 @@ NULL
-10.56
11.00
10.00
-1.00
2.00
NULL
99.99