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.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 22:59:58 +02:00
parent 77992bc710 1423cf5e3d
commit 7841a7eb09
339 changed files with 7425 additions and 2358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/valblk.cpp
View File

@@ -23,7 +23,7 @@
/* Include relevant MariaDB header file. */
/***********************************************************************/
#include "my_global.h"
#if defined(__WIN__)
#if defined(_WIN32)
//#include <windows.h>
#else
#include "osutil.h"