Date: Mon, 22 Oct 2018 16:43:38 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r482756 - branches/2018Q4/databases/xtrabackup/files Message-ID: <201810221643.w9MGhcXF080714@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Oct 22 16:43:38 2018 New Revision: 482756 URL: https://svnweb.freebsd.org/changeset/ports/482756 Log: MFH: r482753 databases/xtrabackup: fix build due to stricter llvm60 c++ PR: 230836 Submitted by: Sergey Akhmatov <sergey@akhmatov.ru> Reported by: rainer@ultra-secure.de Reviewed by: ddrinnon@cdor.net, Approved by: aleks@twindb.com (maintainer timeout) Obtained from: https://github.com/percona/percona-xtrabackup/commit/09069e9ee8f84df0ba3091f591b9269842e71503#diff-765605c50b26c5ee91da8227ac1093b2 Approved by: portmgr (unbreak blanket approval) Added: branches/2018Q4/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc - copied unchanged from r482753, head/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc branches/2018Q4/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc - copied unchanged from r482753, head/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc Modified: Directory Properties: branches/2018Q4/ (props changed) Copied: branches/2018Q4/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc (from r482753, head/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc Mon Oct 22 16:43:38 2018 (r482756, copy of r482753, head/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc) @@ -0,0 +1,11 @@ +--- plugin/keyring/common/system_keys_container.cc.orig 2018-08-27 16:50:01 UTC ++++ plugin/keyring/common/system_keys_container.cc +@@ -125,7 +125,7 @@ void System_keys_container::store_or_upd + if (is_system_key_with_version(key, system_key_id, key_version)) + { + if (system_key_id_to_system_key.count(system_key_id) == 0) // add a new system key +- system_key_id_to_system_key.insert(std::make_pair<std::string, System_key_adapter*>(system_key_id, new System_key_adapter(key_version, key))); ++ system_key_id_to_system_key.insert(std::make_pair(system_key_id, new System_key_adapter(key_version, key))); + else + update_system_key(key, system_key_id, key_version); + } Copied: branches/2018Q4/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc (from r482753, head/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc Mon Oct 22 16:43:38 2018 (r482756, copy of r482753, head/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc) @@ -0,0 +1,11 @@ +--- storage/innobase/row/row0sel.cc.orig 2018-08-27 16:21:56 UTC ++++ storage/innobase/row/row0sel.cc +@@ -5175,7 +5175,7 @@ rec_loop: + reporting due to search views etc. */ + if (prev_rec != NULL + && prebuilt->m_mysql_handler->end_range != NULL +- && prebuilt->idx_cond == false && end_loop >= 100) { ++ && prebuilt->idx_cond == NULL && end_loop >= 100) { + + dict_index_t* key_index = prebuilt->index; + bool clust_templ_for_sec = false;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810221643.w9MGhcXF080714>