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 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2022-10-13 10:05:29 +03:00
parent b6ebadaa66 1feccb505f
commit 588efca237
183 changed files with 4359 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/rocksdb/rdb_datadic.cc
View File

@@ -3131,10 +3131,10 @@ static const Rdb_collation_codec *rdb_init_collation_mapping(
}
}
cur->m_make_unpack_info_func = {Rdb_key_def::make_unpack_simple_varchar,
Rdb_key_def::make_unpack_simple};
cur->m_unpack_func = {Rdb_key_def::unpack_simple_varchar_space_pad,
Rdb_key_def::unpack_simple};
cur->m_make_unpack_info_func = {{Rdb_key_def::make_unpack_simple_varchar,
Rdb_key_def::make_unpack_simple}};
cur->m_unpack_func = {{Rdb_key_def::unpack_simple_varchar_space_pad,
Rdb_key_def::unpack_simple}};
} else {
// Out of luck for now.
}