diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-09-29 16:40:18 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-09-29 16:40:18 +0500 |
| commit | 4357e220619f4acf969e0527a88c43624f5a54fe (patch) | |
| tree | f277bf716cf93d59092787fe0890a03fb85c99b5 /mysql-test/t/strict.test | |
| parent | 1b4d6a055a6407f1e446b8333c9d31e5c2868886 (diff) | |
| parent | 03d411b1d14560ca3b982c7cab2cb78530964806 (diff) | |
| download | mariadb-git-4357e220619f4acf969e0527a88c43624f5a54fe.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2
into mysql.com:/usr/home/bar/mysql-5.0.b6147rpl
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/strict.test')
| -rw-r--r-- | mysql-test/t/strict.test | 8 |
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'); |