Index: branches/2018Q4/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc
===================================================================
--- branches/2018Q4/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc	(nonexistent)
+++ branches/2018Q4/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc	(revision 482756)
@@ -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);
+   }

Property changes on: branches/2018Q4/databases/xtrabackup/files/patch-plugin_keyring_common_system__keys__container.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+ON
\ No newline at end of property
Index: branches/2018Q4/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc
===================================================================
--- branches/2018Q4/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc	(nonexistent)
+++ branches/2018Q4/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc	(revision 482756)
@@ -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;

Property changes on: branches/2018Q4/databases/xtrabackup/files/patch-storage_innobase_row_row0sel.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+ON
\ No newline at end of property
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 482755)
+++ branches/2018Q4	(revision 482756)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r482753