diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-07-24 16:45:24 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-07-24 16:45:24 +0400 |
| commit | e8d593fbda4ce808277df5b2bac0e9ba19506c4d (patch) | |
| tree | a2e544be3fc5f4e528f41290d65c0222486eccc0 /storage | |
| parent | c451c87fb74ca788106226b52f0fa20a341b386f (diff) | |
| download | mariadb-git-e8d593fbda4ce808277df5b2bac0e9ba19506c4d.tar.gz | |
MDEV-4786 - merge 10.0-monty - 10.0
Fixed connect compilation failure (with ODBC).
storage/connect/odbconn.cpp:
min/max are not defined by my_global.h anymore, include osutil.h instead.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/odbconn.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 69fddb2d9f8..757bd09a3ef 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -40,6 +40,7 @@ #include "plgcnx.h" // For DB types #include "resource.h" #include "valblk.h" +#include "osutil.h" #if defined(WIN32) |