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 branch '10.11' into 11.4

Browse source
This commit is contained in:
Oleksandr Byelkin 2025-04-26 10:53:02 +02:00
commit a8d4642375
335 changed files with 7801 additions and 3248 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/mroonga/CMakeLists.txt
View file

@ -17,7 +17,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 2.8...3.12)
project(mroonga)
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

8
storage/mroonga/ha_mroonga.cpp
View file

@ -558,6 +558,9 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation)
case HA_EXTRA_END_ALTER_COPY:
inspected = "HA_EXTRA_END_ALTER_COPY";
break;
case HA_EXTRA_ABORT_ALTER_COPY:
inspected = "HA_EXTRA_ABORT_ALTER_COPY";
break;
#ifdef MRN_HAVE_HA_EXTRA_EXPORT
case HA_EXTRA_EXPORT:
inspected = "HA_EXTRA_EXPORT";
@ -593,6 +596,11 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation)
inspected = "HA_EXTRA_END_ALTER_COPY";
break;
#endif
#ifdef MRN_HAVE_HA_EXTRA_ABORT_ALTER_COPY
case HA_EXTRA_ABORT_ALTER_COPY:
inspected = "HA_EXTRA_ABORT_ALTER_COPY";
break;
#endif
#ifdef MRN_HAVE_HA_EXTRA_NO_AUTOINC_LOCKING
case HA_EXTRA_NO_AUTOINC_LOCKING:
inspected = "HA_EXTRA_NO_AUTOINC_LOCKING";

2
storage/mroonga/vendor/groonga/CMakeLists.txt vendored
View file

@ -15,7 +15,7 @@
# https://buildbot.askmonty.org/buildbot/builders/work-amd64-valgrind/builds/5263/steps/compile/logs/stdio
# says CMake 2.6.2... We want to drop old software support...
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 2.8...3.12)
# cmake_minimum_required(VERSION 2.6.4) # CentOS 5
set(GRN_PROJECT_NAME "groonga")
set(GRN_PROJECT_LABEL "Groonga")

4
storage/mroonga/vendor/groonga/lib/db.c vendored
View file

@ -969,8 +969,8 @@ calc_rec_size(grn_table_flags flags, uint32_t max_n_subrecs, uint32_t range_size
*subrec_size = range_size + sizeof(uint32_t) + sizeof(uint32_t);
break;
}
*value_size = (uintptr_t)GRN_RSET_SUBRECS_NTH((((grn_rset_recinfo *)0)->subrecs),
*subrec_size, max_n_subrecs);
*value_size = (uintptr_t) GRN_RSET_SUBRECS_NTH(offsetof(grn_rset_recinfo, subrecs),
*subrec_size, max_n_subrecs);
} else {
*value_size = range_size;
}

14
storage/mroonga/vendor/groonga/lib/hash.c vendored
View file

@ -1727,15 +1727,15 @@ grn_io_hash_calculate_entry_size(uint32_t key_size, uint32_t value_size,
{
if (flags & GRN_OBJ_KEY_VAR_SIZE) {
if (flags & GRN_OBJ_KEY_LARGE) {
return (uintptr_t)((grn_io_hash_entry_large *)0)->value + value_size;
return offsetof(grn_io_hash_entry_large, value) + value_size;
} else {
return (uintptr_t)((grn_io_hash_entry_normal *)0)->value + value_size;
return offsetof(grn_io_hash_entry_normal, value) + value_size;
}
} else {
if (key_size == sizeof(uint32_t)) {
return (uintptr_t)((grn_plain_hash_entry *)0)->value + value_size;
return offsetof(grn_plain_hash_entry, value) + value_size;
} else {
return (uintptr_t)((grn_rich_hash_entry *)0)->key_and_value
return offsetof(grn_rich_hash_entry, key_and_value)
+ key_size + value_size;
}
}
@ -1865,12 +1865,12 @@ grn_tiny_hash_calculate_entry_size(uint32_t key_size, uint32_t value_size,
{
uint32_t entry_size;
if (flags & GRN_OBJ_KEY_VAR_SIZE) {
entry_size = (uintptr_t)((grn_tiny_hash_entry *)0)->value + value_size;
entry_size = offsetof(grn_tiny_hash_entry, value) + value_size;
} else {
if (key_size == sizeof(uint32_t)) {
entry_size = (uintptr_t)((grn_plain_hash_entry *)0)->value + value_size;
entry_size = offsetof(grn_plain_hash_entry, value) + value_size;
} else {
entry_size = (uintptr_t)((grn_rich_hash_entry *)0)->key_and_value
entry_size = offsetof(grn_rich_hash_entry, key_and_value)
+ key_size + value_size;
}
}

4
storage/mroonga/vendor/groonga/lib/ii.c vendored
View file

@ -2049,7 +2049,7 @@ grn_p_decv(grn_ctx *ctx, uint8_t *data, uint32_t data_size, datavec *dv, uint32_
if ((df & 1)) {
df >>= 1;
size = nreq == dvlen ? data_size : df * nreq;
if (dv[dvlen].data < dv[0].data + size) {
if (!dv[0].data || dv[dvlen].data < dv[0].data + size) {
if (dv[0].data) { GRN_FREE(dv[0].data); }
if (!(rp = GRN_MALLOC(size * sizeof(uint32_t)))) { return 0; }
dv[dvlen].data = rp + size;
@ -10653,7 +10653,7 @@ grn_ii_builder_options_fix(grn_ii_builder_options *options)
}
#define GRN_II_BUILDER_TERM_INPLACE_SIZE\
(sizeof(grn_ii_builder_term) - (uintptr_t)&((grn_ii_builder_term *)0)->dummy)
(sizeof(grn_ii_builder_term) - offsetof(grn_ii_builder_term, dummy))
typedef struct {
grn_id rid; /* Last record ID */

2
storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt vendored
View file

@ -15,7 +15,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1335 USA
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 2.8...3.12)
if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
endif()