cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/xtrabackup: fix build due to stricter llvm60 c++

Browse Source 
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:	09069e9ee8 (diff-765605c50b26c5ee91da8227ac1093b2)
MFH:		2018Q4
This commit is contained in:
Kurt Jaeger 2018-10-22 16:40:57 +00:00
parent 66394d8ce2
commit afe7379fae
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=482753
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc Normal file
View File

@ -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);
}

11
databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc Normal file
View File

@ -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;