Merge 10.0.14 into 10.1

This commit is contained in:
Sergei Golubchik 2014-10-15 12:59:13 +02:00
commit f62c12b405
2115 changed files with 88123 additions and 80328 deletions

View file

@ -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
*/