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/osutil.h | |
| 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/osutil.h')
| -rw-r--r-- | storage/connect/osutil.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/connect/osutil.h b/storage/connect/osutil.h index 63a3e18084c..a6bdb5521b8 100644 --- a/storage/connect/osutil.h +++ b/storage/connect/osutil.h @@ -9,7 +9,6 @@ #define MB_OK 0x00000000 -#if defined(__cplusplus) #if !defined(__MINMAX_DEFINED) #define __MINMAX_DEFINED #ifndef max @@ -19,7 +18,6 @@ #define min(x,y) (((x)<(y))?(x):(y)) #endif #endif -#endif /* __cplusplus */ #ifdef __cplusplus extern "C" { |