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 '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
parent 2a4c573339 6cfd2ba397
commit b83c379420
381 changed files with 10233 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
storage/spider/spd_malloc.cc
View File

@@ -927,23 +927,6 @@ bool spider_string::append(
DBUG_RETURN(res);
}
bool spider_string::append_with_prefill(
const char *s,
uint32 arg_length,
uint32 full_length,
char fill_char
) {
DBUG_ENTER("spider_string::append_with_prefill");
DBUG_PRINT("info",("spider this=%p", this));
DBUG_ASSERT(mem_calc_inited);
DBUG_ASSERT((!current_alloc_mem && !str.is_alloced()) ||
current_alloc_mem == str.alloced_length());
bool res = str.append_with_prefill(s, arg_length, full_length,
fill_char);
SPIDER_STRING_CALC_MEM;
DBUG_RETURN(res);
}
int spider_string::strstr(
const String &search,
uint32 offset