Merge branch '10.4' into 10.5

6daf6bbc · Oleksandr Byelkin · e8f89928 · 1bebc8de · 6daf6bbc
Commit 6daf6bbc authored Nov 14, 2020 by Oleksandr Byelkin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

unittest/sql/mf_iocache-t.cc unittest/sql/mf_iocache-t.cc +1 -1

No files found.
--- a/unittest/sql/mf_iocache-t.cc
+++ b/unittest/sql/mf_iocache-t.cc
@@ -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", \