diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-16 12:12:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-16 12:12:26 +0300 |
| commit | af912664989e0c3ee9cdb6caf8ec439029e7405c (patch) | |
| tree | 9ab694ec5d18e0ab998eb4f52ee86129e5fbd3ae /mysql-test/suite/heap | |
| parent | 5679a2b6b342abc9d80bcf784a1a35f240be9d87 (diff) | |
| parent | 6577a7a8f20538df80b851698e21095311aae190 (diff) | |
| download | mariadb-git-af912664989e0c3ee9cdb6caf8ec439029e7405c.tar.gz | |
Merge 10.3 into 10.4
In main.index_merge_myisam we remove the test that was added in
commit a2d24def8cc42d27c72d833abfb39ef24a2b96ba because
it duplicates the test case that was added in
commit 5af12e463549e4bbc2ce6ab720d78937d5e5db4e.
Diffstat (limited to 'mysql-test/suite/heap')
| -rw-r--r-- | mysql-test/suite/heap/heap.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result index e8d1341aa9b..6bd0582a384 100644 --- a/mysql-test/suite/heap/heap.result +++ b/mysql-test/suite/heap/heap.result @@ -697,7 +697,7 @@ ERROR 42000: Incorrect table definition; there can be only one auto column and i create table t1 (c char(255), primary key(c(90))); insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"); insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"); -ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 'PRIMARY' +ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghi...' for key 'PRIMARY' drop table t1; CREATE TABLE t1 (a int, key(a)) engine=heap; insert into t1 values (0); |