diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-10 09:22:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-10 09:22:40 +0200 |
| commit | 08e2c98ec81d6fb23b0a8079107d4c74d3a8ec02 (patch) | |
| tree | 0a50b801ab5147e359440704c2bdc1f4b1e92d83 /mysql-test/main | |
| parent | f82f8fac94f11e94f94ac1a39e65446bf9710638 (diff) | |
| parent | fef9d6ef1db9a4648a54954c38ea4fbab2a6542c (diff) | |
| download | mariadb-git-08e2c98ec81d6fb23b0a8079107d4c74d3a8ec02.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/order_by_innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/order_by_innodb.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/order_by_innodb.result b/mysql-test/main/order_by_innodb.result index 17d39eb12e6..1d96a62e423 100644 --- a/mysql-test/main/order_by_innodb.result +++ b/mysql-test/main/order_by_innodb.result @@ -154,7 +154,7 @@ id2 int NOT NULL, d1 datetime, d2 timestamp NOT NULL, KEY id2 (id2) -) engine=innodb; +) engine=innodb stats_persistent=0; insert into t2 values (1,2,'2019-03-05 00:00:00','2019-03-06 00:00:00'), (2,3,'2019-03-05 00:00:00','2019-03-06 00:00:00'), diff --git a/mysql-test/main/order_by_innodb.test b/mysql-test/main/order_by_innodb.test index 29b796f67bc..fbff825e26e 100644 --- a/mysql-test/main/order_by_innodb.test +++ b/mysql-test/main/order_by_innodb.test @@ -141,7 +141,7 @@ CREATE TABLE t2 ( d1 datetime, d2 timestamp NOT NULL, KEY id2 (id2) -) engine=innodb; +) engine=innodb stats_persistent=0; insert into t2 values (1,2,'2019-03-05 00:00:00','2019-03-06 00:00:00'), |