diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-21 16:18:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-21 22:58:52 +0200 |
| commit | 3d7915f000b15ad296e3ff18d750f36a4f17de0e (patch) | |
| tree | a5abe2dd6e6b8a633130597aa08937fcc92c965b /mysql-test/suite/engines | |
| parent | 82aeb6b59640b9733c4026bda71887720153b70a (diff) | |
| parent | 4629db0dd6442ea7c2d3ecd636060bc4d21f2d19 (diff) | |
| download | mariadb-git-3d7915f000b15ad296e3ff18d750f36a4f17de0e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/engines')
| -rw-r--r-- | mysql-test/suite/engines/iuds/r/update_time.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/engines/iuds/t/update_time.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/engines/iuds/r/update_time.result b/mysql-test/suite/engines/iuds/r/update_time.result index 48ddb82d521..131780059dd 100644 --- a/mysql-test/suite/engines/iuds/r/update_time.result +++ b/mysql-test/suite/engines/iuds/r/update_time.result @@ -1215,7 +1215,7 @@ c1 c2 838:59:59 838:59:59 UPDATE IGNORE t1 SET t1.c2='99999.99999' WHERE c1 BETWEEN 080000 AND 100000; Warnings: -Warning 1265 Data truncated for column 'c2' at row 1 +Warning 1265 Data truncated for column 'c2' at row N SELECT * FROM t1; c1 c2 -12:12:12 12:12:12 diff --git a/mysql-test/suite/engines/iuds/t/update_time.test b/mysql-test/suite/engines/iuds/t/update_time.test index 5ce69b46986..bdfe81d3c7c 100644 --- a/mysql-test/suite/engines/iuds/t/update_time.test +++ b/mysql-test/suite/engines/iuds/t/update_time.test @@ -172,6 +172,7 @@ SELECT * FROM t1; # Update using range # EXPLAIN SELECT * FROM t1 WHERE c1 BETWEEN 080000 AND 100000; +--replace_regex /(Data truncated for column 'c2' at row) [1-9][0-9]*/\1 N/ UPDATE IGNORE t1 SET t1.c2='99999.99999' WHERE c1 BETWEEN 080000 AND 100000; --sorted_result SELECT * FROM t1; |