revision-id: 47274d902e63663522176614157b4eace8a17b8e (mariadb-10.0.37-13-g47274d902e6) parent(s): 6cecb10a2f8b6536bed78ab6d3791d8befc9d732 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-11-14 15:46:53 +0100 message: fix of test suite --- mysql-test/r/partition_innodb.result | 2 +- mysql-test/t/partition_innodb.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index ee3525cb085..b1405be3f12 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -901,7 +901,7 @@ INSERT INTO t1 VALUES (1),(2); INSERT IGNORE INTO t2 VALUES (2,2),('three',3),(4,4); Warnings: Warning 1366 Incorrect integer value: 'three' for column 'b' at row 2 -UPDATE v SET a = NULL ORDER BY a, b; +UPDATE v SET a = NULL; Warnings: Warning 1292 Truncated incorrect DOUBLE value: 'foo' DROP view v; diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test index 5dbe9f467fa..5674a889023 100644 --- a/mysql-test/t/partition_innodb.test +++ b/mysql-test/t/partition_innodb.test @@ -1008,7 +1008,7 @@ CREATE ALGORITHM = MERGE VIEW v AS SELECT a, b FROM t1 STRAIGHT_JOIN t2 WHERE b INSERT INTO t1 VALUES (1),(2); INSERT IGNORE INTO t2 VALUES (2,2),('three',3),(4,4); -UPDATE v SET a = NULL ORDER BY a, b; +UPDATE v SET a = NULL; DROP view v; DROP TABLE t1, t2;