diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2018-10-22 16:40:57 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2018-10-22 16:40:57 +0000 |
| commit | afe7379faea72d7c99f11c31cdc4c192650f061f (patch) | |
| tree | b56f47dda3eddf6381962684a678476f49949902 | |
| parent | Update to 1.14.0 (diff) | |
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
MFH: 2018Q4
| -rw-r--r-- | databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc | 11 | ||||
| -rw-r--r-- | databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc b/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc new file mode 100644 index 000000000000..d347c6f77f33 --- /dev/null +++ b/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); + } diff --git a/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc b/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc new file mode 100644 index 000000000000..9cb615e95b9e --- /dev/null +++ b/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; |