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

Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä
2022-07-01 15:24:50 +03:00
48 changed files with 526 additions and 269 deletions

View File

@@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2017, Oracle and/or its affiliates.
Copyright (c) 2008, 2021, MariaDB
Copyright (c) 2008, 2022, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -9967,7 +9967,7 @@ int Field_bit::cmp_prefix(const uchar *a, const uchar *b,
}
int Field_bit::key_cmp(const uchar *str, uint length) const
int Field_bit::key_cmp(const uchar *str, uint) const
{
if (bit_len)
{
@@ -9976,7 +9976,6 @@ int Field_bit::key_cmp(const uchar *str, uint length) const
if ((flag= (int) (bits - *str)))
return flag;
str++;
length--;
}
return memcmp(ptr, str, bytes_in_rec);
}