View | Details | Raw Unified | Return to bug 230836
Collapse All | Expand All

(-)databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc (+11 lines)
Line 0 Link Here
1 
--- plugin/keyring/common/system_keys_container.cc.orig	2018-08-27 16:50:01 UTC
2 
+++ plugin/keyring/common/system_keys_container.cc
3 
@@ -125,7 +125,7 @@ void System_keys_container::store_or_upd
4 
   if (is_system_key_with_version(key, system_key_id, key_version))
5 
   {
6 
     if (system_key_id_to_system_key.count(system_key_id) == 0) // add a new system key
7 
-      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)));
8 
+      system_key_id_to_system_key.insert(std::make_pair(system_key_id, new System_key_adapter(key_version, key)));
9 
     else
10 
       update_system_key(key, system_key_id, key_version);
11 
   }
(-)databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc (+11 lines)
Line 0 Link Here
1 
--- storage/innobase/row/row0sel.cc.orig	2018-08-27 16:21:56 UTC
2 
+++ storage/innobase/row/row0sel.cc
3 
@@ -5175,7 +5175,7 @@ rec_loop:
4 
 		reporting due to search views etc. */
5 
 		if (prev_rec != NULL
6 
 		    && prebuilt->m_mysql_handler->end_range != NULL
7 
-		    && prebuilt->idx_cond == false && end_loop >= 100) {
8 
+		    && prebuilt->idx_cond == NULL && end_loop >= 100) {
9
10 
 			dict_index_t*	key_index = prebuilt->index;
11 
 			bool		clust_templ_for_sec = false;

Return to bug 230836