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.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-04-26 08:02:49 +02:00
parent 9e92582024 0ccdf54b64
commit c9b1ebee2f
34 changed files with 317 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unittest/sql/mf_iocache-t.cc
View File

@@ -96,6 +96,8 @@ void sql_print_error(const char *format, ...)
/*** end of encryption tweaks and stubs ****************************/
PRAGMA_DISABLE_CHECK_STACK_FRAME
static IO_CACHE info;
#define CACHE_SIZE 16384
@@ -472,3 +474,4 @@ int main(int argc __attribute__((unused)),char *argv[])
return exit_status();
}
PRAGMA_REENABLE_CHECK_STACK_FRAME