Merge branch '10.5' into 10.6

storage/innobase/trx/trx0rec.cc

@@ -152,7 +152,9 @@ trx_undo_log_v_idx(
 	ulint n_idx = 0;
 	for (const auto& v_index : vcol->v_indexes) {
 		n_idx++;
-		/* FIXME: index->id is 64 bits! */
+		if (uint32_t hi= uint32_t(v_index.index->id >> 32)) {
+			size += 1 + mach_get_compressed_size(hi);
+		}
 		size += mach_get_compressed_size(uint32_t(v_index.index->id));
 		size += mach_get_compressed_size(v_index.nth_field);
 	}
@@ -179,10 +181,14 @@ trx_undo_log_v_idx(
 	ptr += mach_write_compressed(ptr, n_idx);
 
 	for (const auto& v_index : vcol->v_indexes) {
-		ptr += mach_write_compressed(
-			/* FIXME: index->id is 64 bits! */
-			ptr, uint32_t(v_index.index->id));
-
+		/* This is compatible with
+		ptr += mach_u64_write_much_compressed(ptr, v_index.index-id)
+		(the added "if" statement is fixing an old regression). */
+		if (uint32_t hi= uint32_t(v_index.index->id >> 32)) {
+			*ptr++ = 0xff;
+			ptr += mach_write_compressed(ptr, hi);
+		}
+		ptr += mach_write_compressed(ptr, uint32_t(v_index.index->id));
 		ptr += mach_write_compressed(ptr, v_index.nth_field);
 	}
 
@@ -221,7 +227,15 @@ trx_undo_read_v_idx_low(
 	dict_index_t*	clust_index = dict_table_get_first_index(table);
 
 	for (ulint i = 0; i < num_idx; i++) {
-		index_id_t	id = mach_read_next_compressed(&ptr);
+		index_id_t	id = 0;
+		/* This is like mach_u64_read_much_compressed(),
+		but advancing ptr to the next field. */
+		if (*ptr == 0xff) {
+			ptr++;
+			id = mach_read_next_compressed(&ptr);
+			id <<= 32;
+		}
+		id |= mach_read_next_compressed(&ptr);
 		ulint		pos = mach_read_next_compressed(&ptr);
 		dict_index_t*	index = dict_table_get_next_index(clust_index);
 

storage/spider/ha_spider.cc

@@ -4882,10 +4882,6 @@ int ha_spider::rnd_init(
     }
   }
   pushed_pos = NULL;
-/*
-  if (wide_handler->external_lock_type == F_WRLCK)
-    check_and_start_bulk_update(SPD_BU_START_BY_INDEX_OR_RND_INIT);
-*/
   rnd_scan_and_first = scan;
   if (
     scan &&

storage/spider/mysql-test/spider/bg/t/basic_sql.test

@@ -1039,8 +1039,11 @@ if ($USE_CHILD_GROUP2)
   }
 }
 --connection master_1
+# MDEV-36357
+--disable_view_protocol
 SELECT a.a, a.b, date_format(a.c, '%Y-%m-%d %H:%i:%s') FROM tb_l a WHERE
 EXISTS (SELECT * FROM ta_l b WHERE b.b = a.b) ORDER BY a.a;
+--enable_view_protocol
 if ($USE_CHILD_GROUP2)
 {
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/spd_db_conn.cc

@@ -3553,6 +3553,10 @@ int spider_db_store_result(
     db_conn = conn->db_conn;
     if (!result_list->current)
     {
+      /*
+        Point ->current and ->bgs_current to ->first (create ->first
+        if needed)
+      */
       if (!result_list->first)
       {
         if (!(result_list->first = (SPIDER_RESULT *)
@@ -3577,13 +3581,17 @@ int spider_db_store_result(
       }
       result_list->bgs_current = result_list->current;
       current = (SPIDER_RESULT*) result_list->current;
-    } else {
+    } else { /* result_list->current != NULL */
       if (
 #ifndef WITHOUT_SPIDER_BG_SEARCH
         result_list->bgs_phase > 0 ||
 #endif
         result_list->quick_phase > 0
       ) {
+        /*
+          Advance bgs_current to the next result. Create a new result
+          if needed
+        */
         if (result_list->bgs_current == result_list->last)
         {
           if (!(result_list->last = (SPIDER_RESULT *)
@@ -3628,6 +3636,10 @@ int spider_db_store_result(
         }
         current = (SPIDER_RESULT*) result_list->bgs_current;
       } else {
+        /*
+          Advance current to the next result. Create a new result if
+          needed
+        */
         if (result_list->current == result_list->last)
         {
           if (!(result_list->last = (SPIDER_RESULT *)

storage/spider/spd_db_include.h

@@ -1729,7 +1729,7 @@ typedef struct st_spider_result
     st_spider_result   *next;
   SPIDER_POSITION      *first_position; /* for quick mode */
   int                  pos_page_size; /* for quick mode */
-  longlong             record_num;
+  longlong             record_num;    /* number of rows */
   bool                 finish_flg;
   bool                 use_position;
   bool                 first_pos_use_position;
@@ -1781,7 +1781,7 @@ typedef struct st_spider_result_list
   bool                    sorted;
   bool                    desc_flg;
   longlong                current_row_num;
-  longlong                record_num;
+  longlong                record_num; /* number of rows */
   bool                    finish_flg;
   longlong                limit_num;
   longlong                internal_offset;