database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-11-14 20:05:35 +01:00
parent 6083c5a054 81b9c78500
commit 10aa576483
63 changed files with 2033 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ void sql_print_error(const char *format, ...)
/*** end of encryption tweaks and stubs ****************************/
IO_CACHE info;
static IO_CACHE info;
#define CACHE_SIZE 16384
#define INFO_TAIL ", pos_in_file = %llu, pos_in_mem = %lu", \