diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-03-02 12:12:53 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-03-02 12:12:53 +0100 |
| commit | b2956b2ab437403f413b65f6fdaaf706847bc833 (patch) | |
| tree | 3387eec2a227cb595512d60e477dbc168dcfc4fd /storage/connect/tabmul.h | |
| parent | d75e5e6e26c6581ce43403780242f275b6c35f5d (diff) | |
| download | mariadb-git-b2956b2ab437403f413b65f6fdaaf706847bc833.tar.gz | |
Update version number and date
modified: storage/connect/ha_connect.cc
Add conditional SE exception support
modified: storage/connect/json.cpp
modified: storage/connect/plgdbutl.cpp
Change %p in %x in some sprintf functions.
This to avoid some compiler warnings.
modified: storage/connect/tabwmi.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/value.h
Add JavaWrappers.jar to the class path
modified: storage/connect/jdbconn.cpp
Fix wrong declare (char *buf[256]; --> char buf[256];)
modified: storage/connect/xindex.cpp
Diffstat (limited to 'storage/connect/tabmul.h')
| -rw-r--r-- | storage/connect/tabmul.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/tabmul.h b/storage/connect/tabmul.h index 90c8b9037f2..51fa7f9000a 100644 --- a/storage/connect/tabmul.h +++ b/storage/connect/tabmul.h @@ -134,7 +134,7 @@ class TDBDIR : public TDBASE { int iFile; // Index of currently retrieved file #if defined(__WIN__) _finddata_t FileData; // Find data structure - int Hsearch; // Search handle + intptr_t Hsearch; // Search handle char Drive[_MAX_DRIVE]; // Drive name #else // !__WIN__ struct stat Fileinfo; // File info structure @@ -184,7 +184,7 @@ class TDBSDR : public TDBDIR { struct _Sub_Dir *Next; struct _Sub_Dir *Prev; #if defined(__WIN__) - int H; // Search handle + intptr_t H; // Search handle #else // !__WIN__ DIR *D; #endif // !__WIN__ |