database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
Sergei Golubchik
2021-02-12 17:44:22 +01:00
parent ef5adf5207 691f93d6d1
commit 00a313ecf3
309 changed files with 21633 additions and 3317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/rocksdb/rdb_datadic.cc
View File

@@ -1489,12 +1489,12 @@ void Rdb_key_def::pack_with_make_sort_key(
DBUG_ASSERT(*dst != nullptr);
const int max_len = fpi->m_max_image_len;
my_bitmap_map *old_map;
MY_BITMAP*old_map;
old_map= dbug_tmp_use_all_columns(field->table,
field->table->read_set);
&field->table->read_set);
field->sort_string(*dst, max_len);
dbug_tmp_restore_column_map(field->table->read_set, old_map);
dbug_tmp_restore_column_map(&field->table->read_set, old_map);
*dst += max_len;
}