mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.6 into 10.11

Browse source
This commit is contained in:
Marko Mäkelä 2024-11-29 13:43:17 +02:00
commit 3d23adb766
397 changed files with 6217 additions and 4218 deletions
Download patch file Download diff file Expand all files Collapse all files

26
storage/mroonga/ha_mroonga.cpp
View file

@ -603,25 +603,22 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation)
}
#endif
static uchar *mrn_open_tables_get_key(const uchar *record,
size_t *length,
my_bool not_used __attribute__ ((unused)))
static const uchar *mrn_open_tables_get_key(const void *record, size_t *length,
my_bool)
{
MRN_DBUG_ENTER_FUNCTION();
MRN_SHARE *share = reinterpret_cast<MRN_SHARE *>(const_cast<uchar *>(record));
auto share = static_cast<const MRN_SHARE *>(record);
*length = share->table_name_length;
DBUG_RETURN(reinterpret_cast<uchar *>(share->table_name));
DBUG_RETURN(reinterpret_cast<const uchar *>(share->table_name));
}
static uchar *mrn_long_term_share_get_key(const uchar *record,
size_t *length,
my_bool not_used __attribute__ ((unused)))
static const uchar *mrn_long_term_share_get_key(const void *record,
size_t *length, my_bool)
{
MRN_DBUG_ENTER_FUNCTION();
MRN_LONG_TERM_SHARE *long_term_share =
reinterpret_cast<MRN_LONG_TERM_SHARE *>(const_cast<uchar *>(record));
auto long_term_share= static_cast<const MRN_LONG_TERM_SHARE *>(record);
*length = long_term_share->table_name_length;
DBUG_RETURN(reinterpret_cast<uchar *>(long_term_share->table_name));
DBUG_RETURN(reinterpret_cast<const uchar *>(long_term_share->table_name));
}
/* status */
@ -699,13 +696,12 @@ static grn_logger mrn_logger = {
NULL
};
static uchar *mrn_allocated_thds_get_key(const uchar *record,
size_t *length,
my_bool not_used __attribute__ ((unused)))
static const uchar *mrn_allocated_thds_get_key(const void *record,
size_t *length, my_bool)
{
MRN_DBUG_ENTER_FUNCTION();
*length = sizeof(THD *);
DBUG_RETURN(const_cast<uchar *>(record));
DBUG_RETURN(static_cast<const uchar *>(record));
}
/* system functions */

2
storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
View file

@ -693,7 +693,7 @@ namespace mrn {
"data: <%.*s>",
normalized_length,
UINT_MAX16,
field->field_name,
field->field_name.str,
blob_data_length, blob_data);
memcpy(grn_key, normalized, blob_data_length);
new_blob_data_length = blob_data_length;