mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
Merge 10.0.14 into 10.1
This commit is contained in:
commit
f62c12b405
2115 changed files with 88123 additions and 80328 deletions
|
|
@ -521,6 +521,11 @@
|
|||
#endif
|
||||
#define PSAPI_VERSION 1 /* for GetProcessMemoryInfo() */
|
||||
|
||||
/* We don't want the min/max macros */
|
||||
#ifdef __WIN__
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
|
||||
/*
|
||||
MySQL features
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue