diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
| commit | e6bdf77e4be48750c4808a09af197ed91fd69a61 (patch) | |
| tree | 2ca921747b9ae7b01835efe9609799b27efb1387 /mysql-test/main/partition.result | |
| parent | 1599825ffc2c942f8b63274a9556b425229375c7 (diff) | |
| parent | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (diff) | |
| download | mariadb-git-e6bdf77e4be48750c4808a09af197ed91fd69a61.tar.gz | |
Merge 10.3 into 10.4
In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
Diffstat (limited to 'mysql-test/main/partition.result')
| -rw-r--r-- | mysql-test/main/partition.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/partition.result b/mysql-test/main/partition.result index 89dd6e40db1..5a7795394ec 100644 --- a/mysql-test/main/partition.result +++ b/mysql-test/main/partition.result @@ -290,7 +290,7 @@ test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show indexes from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -t1 1 a 1 a A 1 NULL NULL YES BTREE +t1 1 a 1 a A 2 NULL NULL YES BTREE drop table t1; create table t1 (a int) partition by hash (a); |