Merge branch 'bb-10.3-release' into bb-10.4-release

Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately

3 files changed, 44 insertions, 45 deletions

diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index b2600859b88..988c2305b04 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -10112,12 +10112,12 @@ int ha_spider::write_row(
       if (!table->auto_increment_field_not_null)
       {
 #ifndef DBUG_OFF
-        my_bitmap_map *tmp_map =
-          dbug_tmp_use_all_columns(table, table->write_set);
+        MY_BITMAP *tmp_map =
+          dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
         table->next_number_field->store((longlong) 0, TRUE);
 #ifndef DBUG_OFF
-        dbug_tmp_restore_column_map(table->write_set, tmp_map);
+        dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
         force_auto_increment = FALSE;
         table->file->insert_id_for_cur_row = 0;
@@ -10125,13 +10125,13 @@ int ha_spider::write_row(
     } else if (auto_increment_mode == 2)
     {
 #ifndef DBUG_OFF
-      my_bitmap_map *tmp_map =
-        dbug_tmp_use_all_columns(table, table->write_set);
+      MY_BITMAP *tmp_map =
+        dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
       table->next_number_field->store((longlong) 0, TRUE);
       table->auto_increment_field_not_null = FALSE;
 #ifndef DBUG_OFF
-      dbug_tmp_restore_column_map(table->write_set, tmp_map);
+      dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
       force_auto_increment = FALSE;
       table->file->insert_id_for_cur_row = 0;
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc
index 6d2afc1fd55..264f85d74cb 100644
--- a/storage/spider/spd_db_conn.cc
+++ b/storage/spider/spd_db_conn.cc
@@ -1733,7 +1733,7 @@ int spider_db_append_key_where_internal(
   DBUG_PRINT("info", ("spider end_key_part_map=%lu", end_key_part_map));
 
 #ifndef DBUG_OFF
-  my_bitmap_map *tmp_map = dbug_tmp_use_all_columns(table, table->read_set);
+  MY_BITMAP *tmp_map = dbug_tmp_use_all_columns(table, &table->read_set);
 #endif
 
   if (sql_kind == SPIDER_SQL_KIND_HANDLER)
@@ -2663,7 +2663,7 @@ end:
   if (sql_kind == SPIDER_SQL_KIND_SQL)
     dbton_hdl->set_order_pos(sql_type);
 #ifndef DBUG_OFF
-  dbug_tmp_restore_column_map(table->read_set, tmp_map);
+  dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
   DBUG_RETURN(0);
 }
@@ -3200,8 +3200,8 @@ int spider_db_fetch_table(
         bitmap_is_set(table->write_set, (*field)->field_index)
       )) {
 #ifndef DBUG_OFF
-        my_bitmap_map *tmp_map =
-          dbug_tmp_use_all_columns(table, table->write_set);
+        MY_BITMAP *tmp_map =
+          dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
         DBUG_PRINT("info", ("spider bitmap is set %s",
           SPIDER_field_name_str(*field)));
@@ -3209,7 +3209,7 @@ int spider_db_fetch_table(
           spider_db_fetch_row(share, *field, row, ptr_diff)))
           DBUG_RETURN(error_num);
 #ifndef DBUG_OFF
-        dbug_tmp_restore_column_map(table->write_set, tmp_map);
+        dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
       } else {
         DBUG_PRINT("info", ("spider bitmap is not set %s",
@@ -3380,8 +3380,8 @@ int spider_db_fetch_key(
       bitmap_is_set(table->write_set, field->field_index)
     )) {
 #ifndef DBUG_OFF
-      my_bitmap_map *tmp_map =
-        dbug_tmp_use_all_columns(table, table->write_set);
+      MY_BITMAP *tmp_map =
+        dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
       DBUG_PRINT("info", ("spider bitmap is set %s",
         SPIDER_field_name_str(field)));
@@ -3389,7 +3389,7 @@ int spider_db_fetch_key(
         spider_db_fetch_row(share, field, row, ptr_diff)))
         DBUG_RETURN(error_num);
 #ifndef DBUG_OFF
-      dbug_tmp_restore_column_map(table->write_set, tmp_map);
+      dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
     }
     row->next();
@@ -3504,15 +3504,15 @@ int spider_db_fetch_minimum_columns(
         bitmap_is_set(table->write_set, (*field)->field_index)
       )) {
 #ifndef DBUG_OFF
-        my_bitmap_map *tmp_map =
-          dbug_tmp_use_all_columns(table, table->write_set);
+        MY_BITMAP *tmp_map =
+          dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
         DBUG_PRINT("info", ("spider bitmap is set %s",
           SPIDER_field_name_str(*field)));
         if ((error_num = spider_db_fetch_row(share, *field, row, ptr_diff)))
           DBUG_RETURN(error_num);
 #ifndef DBUG_OFF
-        dbug_tmp_restore_column_map(table->write_set, tmp_map);
+        dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
       }
       row->next();
@@ -5670,8 +5670,8 @@ int spider_db_seek_tmp_table(
       bitmap_is_set(table->write_set, (*field)->field_index)
     )) {
 #ifndef DBUG_OFF
-      my_bitmap_map *tmp_map =
-        dbug_tmp_use_all_columns(table, table->write_set);
+      MY_BITMAP *tmp_map =
+        dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
       DBUG_PRINT("info", ("spider bitmap is set %s",
         SPIDER_field_name_str(*field)));
@@ -5679,7 +5679,7 @@ int spider_db_seek_tmp_table(
         spider_db_fetch_row(spider->share, *field, row, ptr_diff)))
         DBUG_RETURN(error_num);
 #ifndef DBUG_OFF
-      dbug_tmp_restore_column_map(table->write_set, tmp_map);
+      dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
     }
     row->next();
@@ -5758,8 +5758,8 @@ int spider_db_seek_tmp_key(
       bitmap_is_set(table->write_set, field->field_index)
     )) {
 #ifndef DBUG_OFF
-      my_bitmap_map *tmp_map =
-        dbug_tmp_use_all_columns(table, table->write_set);
+      MY_BITMAP *tmp_map =
+        dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
       DBUG_PRINT("info", ("spider bitmap is set %s",
         SPIDER_field_name_str(field)));
@@ -5767,7 +5767,7 @@ int spider_db_seek_tmp_key(
         spider_db_fetch_row(spider->share, field, row, ptr_diff)))
         DBUG_RETURN(error_num);
 #ifndef DBUG_OFF
-      dbug_tmp_restore_column_map(table->write_set, tmp_map);
+      dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
     }
     row->next();
@@ -5849,8 +5849,8 @@ int spider_db_seek_tmp_minimum_columns(
         bitmap_is_set(table->write_set, (*field)->field_index)));
 */
 #ifndef DBUG_OFF
-      my_bitmap_map *tmp_map =
-        dbug_tmp_use_all_columns(table, table->write_set);
+      MY_BITMAP *tmp_map =
+        dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
       DBUG_PRINT("info", ("spider bitmap is set %s",
         SPIDER_field_name_str(*field)));
@@ -5859,7 +5859,7 @@ int spider_db_seek_tmp_minimum_columns(
         DBUG_RETURN(error_num);
       row->next();
 #ifndef DBUG_OFF
-      dbug_tmp_restore_column_map(table->write_set, tmp_map);
+      dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
     }
     else if (bitmap_is_set(table->read_set, (*field)->field_index))
@@ -9668,7 +9668,7 @@ int spider_db_open_item_string(
   {
     THD *thd = NULL;
     TABLE *table;
-    my_bitmap_map *saved_map;
+    MY_BITMAP *saved_map;
     Time_zone *saved_time_zone;
     String str_value;
     char tmp_buf[MAX_FIELD_WIDTH];
@@ -9697,7 +9697,7 @@ int spider_db_open_item_string(
         */
         table = field->table;
         thd = table->in_use;
-        saved_map = dbug_tmp_use_all_columns(table, table->write_set);
+        saved_map = dbug_tmp_use_all_columns(table, &table->write_set);
         item->save_in_field(field, FALSE);
         saved_time_zone = thd->variables.time_zone;
         thd->variables.time_zone = UTC;
@@ -9742,7 +9742,7 @@ end:
     if (thd)
     {
       thd->variables.time_zone = saved_time_zone;
-      dbug_tmp_restore_column_map(table->write_set, saved_map);
+      dbug_tmp_restore_column_map(&table->write_set, saved_map);
     }
   }
 
@@ -9784,7 +9784,7 @@ int spider_db_open_item_int(
   {
     THD *thd = NULL;
     TABLE *table;
-    my_bitmap_map *saved_map;
+    MY_BITMAP *saved_map;
     Time_zone *saved_time_zone;
     String str_value;
     bool print_quoted_string;
@@ -9812,7 +9812,7 @@ int spider_db_open_item_int(
       */
       table = field->table;
       thd = table->in_use;
-      saved_map = dbug_tmp_use_all_columns(table, table->write_set);
+      saved_map = dbug_tmp_use_all_columns(table, &table->write_set);
       item->save_in_field(field, FALSE);
       saved_time_zone = thd->variables.time_zone;
       thd->variables.time_zone = UTC;
@@ -9858,7 +9858,7 @@ end:
     if (thd)
     {
       thd->variables.time_zone = saved_time_zone;
-      dbug_tmp_restore_column_map(table->write_set, saved_map);
+      dbug_tmp_restore_column_map(&table->write_set, saved_map);
     }
   }
 
@@ -10178,8 +10178,8 @@ int spider_db_udf_fetch_table(
     DBUG_RETURN(HA_ERR_END_OF_FILE);
 
 #ifndef DBUG_OFF
-  my_bitmap_map *tmp_map =
-    dbug_tmp_use_all_columns(table, table->write_set);
+  MY_BITMAP *tmp_map =
+    dbug_tmp_use_all_columns(table, &table->write_set);
 #endif
   for (
     roop_count = 0,
@@ -10192,7 +10192,7 @@ int spider_db_udf_fetch_table(
       spider_db_udf_fetch_row(trx, *field, row)))
     {
 #ifndef DBUG_OFF
-      dbug_tmp_restore_column_map(table->write_set, tmp_map);
+      dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
       DBUG_RETURN(error_num);
     }
@@ -10202,7 +10202,7 @@ int spider_db_udf_fetch_table(
   for (; roop_count < set_off; roop_count++, field++)
     (*field)->set_default();
 #ifndef DBUG_OFF
-  dbug_tmp_restore_column_map(table->write_set, tmp_map);
+  dbug_tmp_restore_column_map(&table->write_set, tmp_map);
 #endif
   table->status = 0;
   DBUG_RETURN(0);
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index 420f14f9919..86ce0c530b1 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -9690,8 +9690,7 @@ int spider_mbase_handler::append_update_set(
         mysql_share->append_column_name(str, (*fields)->field_index);
         str->q_append(SPIDER_SQL_EQUAL_STR, SPIDER_SQL_EQUAL_LEN);
 #ifndef DBUG_OFF
-        my_bitmap_map *tmp_map = dbug_tmp_use_all_columns(table,
-          table->read_set);
+        MY_BITMAP *tmp_map = dbug_tmp_use_all_columns(table, &table->read_set);
 #endif
         if (
           spider_db_mbase_utility->
@@ -9700,12 +9699,12 @@ int spider_mbase_handler::append_update_set(
           str->reserve(SPIDER_SQL_COMMA_LEN)
         ) {
 #ifndef DBUG_OFF
-          dbug_tmp_restore_column_map(table->read_set, tmp_map);
+          dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
           DBUG_RETURN(HA_ERR_OUT_OF_MEM);
         }
 #ifndef DBUG_OFF
-        dbug_tmp_restore_column_map(table->read_set, tmp_map);
+        dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
       }
       str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
@@ -12426,8 +12425,8 @@ int spider_mbase_handler::append_insert_values(
       bitmap_is_set(table->read_set, (*field)->field_index)
     ) {
 #ifndef DBUG_OFF
-      my_bitmap_map *tmp_map =
-        dbug_tmp_use_all_columns(table, table->read_set);
+      MY_BITMAP *tmp_map =
+        dbug_tmp_use_all_columns(table, &table->read_set);
 #endif
       add_value = TRUE;
       DBUG_PRINT("info",("spider is_null()=%s",
@@ -12449,7 +12448,7 @@ int spider_mbase_handler::append_insert_values(
         if (str->reserve(SPIDER_SQL_NULL_LEN + SPIDER_SQL_COMMA_LEN))
         {
 #ifndef DBUG_OFF
-          dbug_tmp_restore_column_map(table->read_set, tmp_map);
+          dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
           str->length(0);
           DBUG_RETURN(HA_ERR_OUT_OF_MEM);
@@ -12463,7 +12462,7 @@ int spider_mbase_handler::append_insert_values(
           str->reserve(SPIDER_SQL_COMMA_LEN)
         ) {
 #ifndef DBUG_OFF
-          dbug_tmp_restore_column_map(table->read_set, tmp_map);
+          dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
           str->length(0);
           DBUG_RETURN(HA_ERR_OUT_OF_MEM);
@@ -12471,7 +12470,7 @@ int spider_mbase_handler::append_insert_values(
       }
       str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN);
 #ifndef DBUG_OFF
-      dbug_tmp_restore_column_map(table->read_set, tmp_map);
+      dbug_tmp_restore_column_map(&table->read_set, tmp_map);
 #endif
     }
   }