PXB-1570: XtraBackup is affected by PS-4519

- applied Percona Server patch fixing PS-4519 - applied MySQL patch fixing Bug#26918439
percona · Aug 15, 2018 · 09069e9 · 09069e9
1 parent 2ae68ef
commit 09069e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugin/keyring/common/system_keys_container.cc b/plugin/keyring/common/system_keys_container.cc
@@ -125,7 +125,7 @@ void System_keys_container::store_or_update_if_system_key_with_version(IKey *key
   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/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
@@ -5175,7 +5175,7 @@ row_search_mvcc(
 		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;