summaryrefslogtreecommitdiff
path: root/mysql-test/t/strict.test
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-10-03 14:24:43 +0200
committermsvensson@neptunus.(none) <>2006-10-03 14:24:43 +0200
commit3f8edc3706e56684bc77896219e062874fecad29 (patch)
treece65490bd585d1b82550064472dd7946246fc32b /mysql-test/t/strict.test
parent9a8bc01f8c2af11fe8c877c2df496f0a74556cd5 (diff)
parent40bcedf4e3dc03b63064ab278218764cc4829bdf (diff)
downloadmariadb-git-3f8edc3706e56684bc77896219e062874fecad29.tar.gz
Merge bk-internal:/home/bk/mysql-5.0-rpl
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'mysql-test/t/strict.test')
-rw-r--r--mysql-test/t/strict.test8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test
index 6f22b81172d..6ebbb53ed8e 100644
--- a/mysql-test/t/strict.test
+++ b/mysql-test/t/strict.test
@@ -649,9 +649,9 @@ UPDATE t1 SET col2 =col2 + 50 WHERE col2 > 0;
UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
--error 1365
UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
---error 1264
+--error 1366
INSERT INTO t1 (col1) VALUES ('');
---error 1264
+--error 1366
INSERT INTO t1 (col1) VALUES ('a59b');
--error 1265
INSERT INTO t1 (col1) VALUES ('1a');
@@ -710,9 +710,9 @@ INSERT INTO t1 (col2) VALUES(18446744073709551616.0);
UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
--error 1365
UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
---error 1264
+--error 1366
INSERT INTO t1 (col1) VALUES ('');
---error 1264
+--error 1366
INSERT INTO t1 (col1) VALUES ('a59b');
--error 1265
INSERT INTO t1 (col1) VALUES ('1a');