summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlad Lesin <vlad_lesin@mail.ru>2020-01-22 21:13:14 +0300
committerVlad Lesin <vlad_lesin@mail.ru>2020-01-22 21:13:14 +0300
commit09592bc4e3422949b72ed421b134671a823034a6 (patch)
treec80c1d5933ea064b0f7e2a684bce75c3a9d4369b
parent4e7f3fb8332c42c3beb2376ee0d90f559f1e7470 (diff)
downloadmariadb-git-bb-10.2-MDEV-14183-aria_pack.tar.gz
MDEV-14183: aria_pack segfaults in compress_maria_filebb-10.2-MDEV-14183-aria_pack
Post-push fix. aria_pack_mdev14183 test is unstable. The fix is the following: 1. Disable the test for embedded server. 2. Create non-"transactional" Aria table in the test, as aria_pack does not support "transactional" Aria tables.
-rw-r--r--mysql-test/suite/maria/aria_pack_mdev14183.result2
-rw-r--r--mysql-test/suite/maria/aria_pack_mdev14183.test3
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/suite/maria/aria_pack_mdev14183.result b/mysql-test/suite/maria/aria_pack_mdev14183.result
index cd1decdef75..b20f60c5b8a 100644
--- a/mysql-test/suite/maria/aria_pack_mdev14183.result
+++ b/mysql-test/suite/maria/aria_pack_mdev14183.result
@@ -3,7 +3,7 @@ CREATE TABLE `t` (
`col_2` varchar(255) NOT NULL,
`col_3` int(11) NOT NULL DEFAULT '0',
`col_4` int(11) NOT NULL DEFAULT '0'
-) ENGINE=Aria;
+) ENGINE=Aria TRANSACTIONAL=0 PAGE_CHECKSUM=0;
insert into t values
('foobar','qux',0,0),('abcdef','qux',0,0);
Compressing test/t.MAD: (2 records)
diff --git a/mysql-test/suite/maria/aria_pack_mdev14183.test b/mysql-test/suite/maria/aria_pack_mdev14183.test
index ab0589dc780..5386ae774a0 100644
--- a/mysql-test/suite/maria/aria_pack_mdev14183.test
+++ b/mysql-test/suite/maria/aria_pack_mdev14183.test
@@ -1,12 +1,13 @@
--source include/have_aria.inc
--source include/have_debug.inc
+--source include/not_embedded.inc
CREATE TABLE `t` (
`col_1` varchar(255) NOT NULL DEFAULT '',
`col_2` varchar(255) NOT NULL,
`col_3` int(11) NOT NULL DEFAULT '0',
`col_4` int(11) NOT NULL DEFAULT '0'
-) ENGINE=Aria;
+) ENGINE=Aria TRANSACTIONAL=0 PAGE_CHECKSUM=0;
insert into t values
('foobar','qux',0,0),('abcdef','qux',0,0);