summaryrefslogtreecommitdiff
path: root/mysql-test/r/strict.result
diff options
context:
space:
mode:
authorkaa@kaamos.(none) <>2008-02-20 00:37:51 +0300
committerkaa@kaamos.(none) <>2008-02-20 00:37:51 +0300
commit58240614f708146d2e6561ac317db2e5fba88f7d (patch)
tree50714ed39d62001f7f35f1ad46aa5e60d14f2fca /mysql-test/r/strict.result
parentee33f1366864685599120267cc7540940b0d0361 (diff)
parent8d222210c77ba9152e3ba35d937d9b08a8266295 (diff)
downloadmariadb-git-58240614f708146d2e6561ac317db2e5fba88f7d.tar.gz
Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236
into kaamos.(none):/data/src/opt/mysql-5.1-opt
Diffstat (limited to 'mysql-test/r/strict.result')
-rw-r--r--mysql-test/r/strict.result5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index 243c6192cc6..ef58a760297 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -895,7 +895,6 @@ ERROR 22003: Out of range value for column 'col1' at row 1
INSERT INTO t1 (col2) VALUES ('-1.2E-3');
ERROR 22003: Out of range value for column 'col2' at row 1
UPDATE t1 SET col1 =col1 * 5000 WHERE col1 > 0;
-ERROR 22003: Out of range value for column 'col1' at row 3
UPDATE t1 SET col2 =col2 / 0 WHERE col2 > 0;
ERROR 22012: Division by 0
UPDATE t1 SET col2= MOD(col2,0) WHERE col2 > 0;
@@ -923,10 +922,10 @@ SELECT * FROM t1;
col1 col2
-2.2e-307 0
1e-303 0
-1.7e+308 1.7e+308
+NULL 1.7e+308
-2.2e-307 0
-2e-307 0
-1.7e+308 1.7e+308
+NULL 1.7e+308
0 NULL
2 NULL
NULL NULL