diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:06:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:31:57 +0200 |
| commit | b1818dccf772e0fd495502c6dfc1600853e007d0 (patch) | |
| tree | d9c441c38681d634d50cf36021a3bf439b2e44ca /mysql-test/suite/engines | |
| parent | c34602995894c9a04f4312484cfe6e45c43426e6 (diff) | |
| parent | aafb9d44d65e42df72af28c940e5b23b4bc3bd43 (diff) | |
| download | mariadb-git-b1818dccf772e0fd495502c6dfc1600853e007d0.tar.gz | |
Merge branch '10.2' into 10.3
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; |