From 7d72270ea9bda5054790247fa85392e3b2fd105f Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Fri, 8 Nov 2019 14:58:09 -0500 Subject: [PATCH] dev-db/mariadb: Version bump for 10.2.29 Upstream recommends immediate removal of 10.2.28 Despite the fact that it was published with the patch 10.2.29 fixed, this comforts users. Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Brian Evans --- dev-db/mariadb/Manifest | 2 +- .../mariadb/files/MDEV-20987-fulltext.patch | 185 ------------------ ...-10.2.28.ebuild => mariadb-10.2.29.ebuild} | 1 - 3 files changed, 1 insertion(+), 187 deletions(-) delete mode 100644 dev-db/mariadb/files/MDEV-20987-fulltext.patch rename dev-db/mariadb/{mariadb-10.2.28.ebuild => mariadb-10.2.29.ebuild} (99%) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 7958d696b60b..2b4d7cf70345 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -3,7 +3,7 @@ DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 91ebc6d24c80ad9651c42a2f4553ce3ec3b DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2 DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c SHA512 1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124 DIST mariadb-10.2.27.tar.gz 73068579 BLAKE2B 7e4ae229040b3136ad107979864bc391556c1ba83847addd89e09f3757cd01203503e07832abe496a7f560048ed704f273607da3a114afa59ceb13cbb3b89c14 SHA512 9ea7ea30f964d022d16c662c18ac40ea50ef5b6592d02ba739ad81f9dfa9e60be90ea6d4706b43b07402c4cbc8c0280633b6e21bda6daf5bbc1d3c540993e4d6 -DIST mariadb-10.2.28.tar.gz 73078014 BLAKE2B cd1f11c35538590f0e864d1ab46968888e1eaa3e239fc9760e00c3ad09aa054bb58f425931516e2ec2ef88869ab79039a95aec14d28e430e9a14169ec7d305ea SHA512 4fdad47cdbe0643c8a9d40210aef0c135ee42b1696f6b9903e155522c8481f284d14dd96b21f06eb64f7b0dbb7591844109a03a2836cfb8a187b7aac8037c815 +DIST mariadb-10.2.29.tar.gz 73087972 BLAKE2B aa3fe880f00b02846b26f16fcd37d18ebe217a2c9680c8c535042d2759852c929cd649d662c6a2bc603d934a6ba770ef945752c99d150f539e1fdd0d9be0ad51 SHA512 cee4e0d1a2b203cadaaa5678c5ce17302f18ffa55d07c8329392b1ea84740340c006eb9ab5920beef80835c2a399d5fffca409b8288e10ae62d290af62ec4ab8 DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826 SHA512 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940 SHA512 817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242 DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f SHA512 cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce diff --git a/dev-db/mariadb/files/MDEV-20987-fulltext.patch b/dev-db/mariadb/files/MDEV-20987-fulltext.patch deleted file mode 100644 index 4052938b0524..000000000000 --- a/dev-db/mariadb/files/MDEV-20987-fulltext.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 5c3bbbd845fe38a125553c62976c1165b2d9b8d7 Mon Sep 17 00:00:00 2001 -From: Thirunarayanan Balathandayuthapani -Date: Wed, 6 Nov 2019 10:20:32 +0530 -Subject: [PATCH] MDEV-20987 InnoDB fails to start when fts table has FK - relation - -InnoDB: Assertion failure in file .../dict/dict0dict.cc line ... -InnoDB: Failing assertion: table->can_be_evicted - -This fixes a regression that was caused by the fix of MDEV-20621 -(commit a41d429765c7ddb528b9b438c68b25ff55d3bd55). -MySQL 5.6 (and MariaDB 10.0) introduced eviction of tables from -the InnoDB data dictionary cache. Tables that are connected to -FOREIGN KEY constraints or FULLTEXT INDEX are exempt of the eviction. -With the problematic change, a table that would already be exempt -from eviction due to FOREIGN KEY would cause the problem if there -also was a FULLTEXT INDEX defined on it. - -dict_load_table(): Only prevent eviction if table->can_be_evicted holds. ---- - .../suite/innodb_fts/r/innodb_fts_misc.result | 21 ++++++---------- - .../suite/innodb_fts/t/innodb_fts_misc.test | 24 +++++++------------ - storage/innobase/dict/dict0load.cc | 2 +- - storage/xtradb/dict/dict0load.cc | 2 +- - 4 files changed, 17 insertions(+), 32 deletions(-) - -diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result -index 71eded74be46..a2a73840723d 100644 ---- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result -+++ b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result -@@ -1,4 +1,3 @@ --drop table if exists t1; - CREATE TABLE t1 ( - id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY, - a VARCHAR(200), -@@ -415,7 +414,6 @@ AGAINST ('"following database"@10' IN BOOLEAN MODE); - id - 105 - DROP TABLE t1; --drop table if exists t50; - set names utf8; - "----------Test1---------" - create table t50 (s1 varchar(60) character set utf8 collate utf8_bin) engine = innodb; -@@ -670,9 +668,6 @@ s1 - ŁŁŁŁ - LLLL - ŁŁŁŁ ŁŁŁŁ --DROP TABLE if EXISTS t2; --Warnings: --Note 1051 Unknown table 'test.t2' - CREATE TABLE t2 (s1 VARCHAR(60) CHARACTER SET UTF8 COLLATE UTF8_POLISH_CI) ENGINE = InnoDB; - CREATE FULLTEXT INDEX i ON t2 ( s1); - Warnings: -@@ -739,7 +734,12 @@ ALTER TABLE t2 DROP a; - SET @@autocommit=0; - CREATE FULLTEXT INDEX i ON t1 (char_column); - INSERT INTO t1 values (1,'aaa'); --"restart server..." -+CREATE TABLE mdev20987_1(f1 INT NOT NULL, PRIMARY KEY(f1))ENGINE=InnoDB; -+CREATE TABLE mdev20987_2(f1 INT NOT NULL, f2 CHAR(100), -+FULLTEXT(f2), -+FOREIGN KEY(f1) REFERENCES mdev20987_1(f1))ENGINE=InnoDB; -+INSERT INTO mdev20987_1 VALUES(1); -+INSERT INTO mdev20987_2 VALUES(1, 'mariadb'); - SHOW CREATE TABLE t2; - Table Create Table - t2 CREATE TABLE `t2` ( -@@ -747,12 +747,8 @@ t2 CREATE TABLE `t2` ( - PRIMARY KEY (`FTS_DOC_ID`) - ) ENGINE=InnoDB DEFAULT CHARSET=latin1 - DELETE FROM t1 WHERE MATCH(char_column) AGAINST ('bbb'); --SET @@autocommit=1; --DROP TABLE t1, t2; -+DROP TABLE t1, t2, mdev20987_2, mdev20987_1; - "----------Test28---------" --drop table if exists `fts_test`; --Warnings: --Note 1051 Unknown table 'test.fts_test' - create table `fts_test`(`a` text,fulltext key(`a`))engine=innodb; - set session autocommit=0; - insert into `fts_test` values (''); -@@ -942,9 +938,6 @@ id title body - 2 How To Use MySQL Well After you went through a ... - 3 Optimizing MySQL In this tutorial we will show ... - DROP TABLE articles; --drop table if exists t1; --Warnings: --Note 1051 Unknown table 'test.t1' - create table t1 (FTS_DOC_ID bigint unsigned auto_increment not null primary key, - title varchar(200),body text,fulltext(title,body)) engine=innodb; - insert into t1 set body='test'; -diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test b/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test -index e226b2769664..2e8ff4ea48e2 100644 ---- a/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test -+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test -@@ -5,10 +5,6 @@ - let collation=UTF8_UNICODE_CI; - --source include/have_collation.inc - ----disable_warnings --drop table if exists t1; ----enable_warnings -- - # Create FTS table - CREATE TABLE t1 ( - id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY, -@@ -401,10 +397,6 @@ DROP TABLE t1; - #------------------------------------------------------------------------------ - # More FTS test from peter's testing - #------------------------------------------------------------------------------ ----disable_warnings --drop table if exists t50; ----enable_warnings -- - set names utf8; - - -@@ -606,7 +598,6 @@ CREATE FULLTEXT INDEX i ON t1 (s1); - INSERT INTO t1 VALUES - ('a'),('b'),('c'),('d'),('ŁŁŁŁ'),('LLLL'),(NULL),('ŁŁŁŁ ŁŁŁŁ'),('LLLLLLLL'); - SELECT * FROM t1 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI); --DROP TABLE if EXISTS t2; - CREATE TABLE t2 (s1 VARCHAR(60) CHARACTER SET UTF8 COLLATE UTF8_POLISH_CI) ENGINE = InnoDB; - CREATE FULLTEXT INDEX i ON t2 ( s1); - INSERT INTO t2 VALUES -@@ -672,16 +663,19 @@ ALTER TABLE t2 DROP a; - SET @@autocommit=0; - CREATE FULLTEXT INDEX i ON t1 (char_column); - INSERT INTO t1 values (1,'aaa'); --echo "restart server..."; --# Restart the server -+ -+CREATE TABLE mdev20987_1(f1 INT NOT NULL, PRIMARY KEY(f1))ENGINE=InnoDB; -+CREATE TABLE mdev20987_2(f1 INT NOT NULL, f2 CHAR(100), -+ FULLTEXT(f2), -+ FOREIGN KEY(f1) REFERENCES mdev20987_1(f1))ENGINE=InnoDB; -+INSERT INTO mdev20987_1 VALUES(1); -+INSERT INTO mdev20987_2 VALUES(1, 'mariadb'); - --source include/restart_mysqld.inc - SHOW CREATE TABLE t2; - DELETE FROM t1 WHERE MATCH(char_column) AGAINST ('bbb'); --SET @@autocommit=1; --DROP TABLE t1, t2; -+DROP TABLE t1, t2, mdev20987_2, mdev20987_1; - - --echo "----------Test28---------" --drop table if exists `fts_test`; - create table `fts_test`(`a` text,fulltext key(`a`))engine=innodb; - set session autocommit=0; - insert into `fts_test` values (''); -@@ -870,8 +864,6 @@ DROP TABLE articles; - # Test for Bug 13940669 - 64901: INNODB: ASSERTION FAILURE IN - # THREAD 34387022112 IN FILE REM0CMP.CC LINE 5 - --drop table if exists t1; -- - create table t1 (FTS_DOC_ID bigint unsigned auto_increment not null primary key, - title varchar(200),body text,fulltext(title,body)) engine=innodb; - -diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc -index 3a6851cff892..484c4c5e9669 100644 ---- a/storage/innobase/dict/dict0load.cc -+++ b/storage/innobase/dict/dict0load.cc -@@ -2551,7 +2551,7 @@ dict_load_table( - fts_free(table); - } else if (fts_optimize_wq) { - fts_optimize_add_table(table); -- } else { -+ } else if (table->can_be_evicted) { - /* fts_optimize_thread is not started yet. - So make the table as non-evictable from cache. */ - dict_table_move_from_lru_to_non_lru(table); -diff --git a/storage/xtradb/dict/dict0load.cc b/storage/xtradb/dict/dict0load.cc -index 292a1752771d..531174bc11fe 100644 ---- a/storage/xtradb/dict/dict0load.cc -+++ b/storage/xtradb/dict/dict0load.cc -@@ -2573,7 +2573,7 @@ dict_load_table( - fts_free(table); - } else if (fts_optimize_wq) { - fts_optimize_add_table(table); -- } else { -+ } else if (table->can_be_evicted) { - /* fts_optimize_thread is not started yet. - So make the table as non-evictable from cache. */ - dict_table_move_from_lru_to_non_lru(table); diff --git a/dev-db/mariadb/mariadb-10.2.28.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.2.28.ebuild rename to dev-db/mariadb/mariadb-10.2.29.ebuild index 3c7df7cd4689..df420dcf7436 100644 --- a/dev-db/mariadb/mariadb-10.2.28.ebuild +++ b/dev-db/mariadb/mariadb-10.2.29.ebuild @@ -64,7 +64,6 @@ PATCHES=( "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch "${MY_PATCH_DIR}"/20035_all_mariadb-10.2-atomic-detection.patch - "${FILESDIR}/MDEV-20987-fulltext.patch" ) # Be warned, *DEPEND are version-dependant -- 2.26.2