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.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-29 13:51:02 +02:00
parent 6152ab7b42 fb8be6a631
commit 83d7e4faf6
140 changed files with 2655 additions and 1338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/array.cpp
View File

@@ -19,14 +19,14 @@
#include "sql_class.h"
//#include "sql_time.h"
#if defined(__WIN__)
#if defined(_WIN32)
//#include <windows.h>
#else // !__WIN__
#else // !_WIN32
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdint.h> // for uintprt_h
#endif // !__WIN__
#endif // !_WIN32
/***********************************************************************/
/* Include required application header files */