diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-07-23 18:29:16 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-07-23 18:29:16 +0400 |
| commit | b2aea91fcbbdde9e16a3aa54691e968890b634e4 (patch) | |
| tree | 49887b0280c6e5f971a147bc974b041b67a82890 /storage/connect/value.cpp | |
| parent | 84d073848a76e15bdd02c54f5c0965156eb6f095 (diff) | |
| download | mariadb-git-b2aea91fcbbdde9e16a3aa54691e968890b634e4.tar.gz | |
MDEV-4786 - merge 10.0-monty → 10.0
Fixed connect compilation failure.
storage/connect/csort.cpp:
min/max are not defined by my_global.h anymore, include osutil.h instead.
storage/connect/filamfix.cpp:
min/max are not defined by my_global.h anymore, include osutil.h instead.
storage/connect/ha_connect.cc:
Renamed MYSQL_ERROR -> Sql_condition.
Renamed KEY::key_parts -> KEY::user_defined_key_parts.
Adjusted connect according to:
WL#4305 - storage-engine private data area per physical table.
storage/connect/ha_connect.h:
Adjusted connect according to:
WL#4305 - storage-engine private data area per physical table.
storage/connect/inihandl.c:
min/max are not defined by my_global.h anymore, include osutil.h instead.
storage/connect/osutil.h:
min/max are not defined by my_global.h anymore, define them for C as well.
storage/connect/taboccur.cpp:
Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/tabpivot.cpp:
Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/tabtbl.cpp:
Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/tabxcl.cpp:
Include server headers before osutil.h to avoid min/max redefinition.
storage/connect/value.cpp:
min/max are not defined by my_global.h anymore, include osutil.h instead.
Include server headers before osutil.h to avoid min/max redefinition.
Diffstat (limited to 'storage/connect/value.cpp')
| -rw-r--r-- | storage/connect/value.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp index e75a6e41557..10e3be7e889 100644 --- a/storage/connect/value.cpp +++ b/storage/connect/value.cpp @@ -27,6 +27,9 @@ /* Include relevant MariaDB header file. */ /***********************************************************************/ #include "my_global.h" +#include "sql_class.h" +#include "sql_time.h" + #if defined(WIN32) //#include <windows.h> #else // !WIN32 @@ -49,6 +52,7 @@ #include "valblk.h" #define NO_FUNC // Already defined in ODBConn #include "plgcnx.h" // For DB types +#include "osutil.h" /***********************************************************************/ /* Check macro's. */ @@ -1249,9 +1253,6 @@ void DTVAL::SetTimeShift(void) /* though the gmtime C function. The purpose of this function is to */ /* extend the range of valid dates by accepting negative time values. */ /***********************************************************************/ -#include "sql_class.h" -#include "sql_time.h" - static void TIME_to_localtime(struct tm *tm, const MYSQL_TIME *ltime) { bzero(tm, sizeof(*tm)); |