Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d3f82e3a
Commit
d3f82e3a
authored
Mar 27, 2017
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix connect engine crashes in buildbot tests on Win64.
Do not truncate pointers returned by _findfirst to int.
parent
b56262f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
storage/connect/tabmul.cpp
storage/connect/tabmul.cpp
+2
-2
storage/connect/tabmul.h
storage/connect/tabmul.h
+2
-2
No files found.
storage/connect/tabmul.cpp
View file @
d3f82e3a
...
...
@@ -711,7 +711,7 @@ int TDBDIR::GetMaxSize(PGLOBAL g)
if
(
MaxSize
<
0
)
{
int
n
=
-
1
;
#if defined(__WIN__)
int
h
;
int
ptr_t
h
;
// Start searching files in the target directory.
h
=
_findfirst
(
Path
(
g
),
&
FileData
);
...
...
@@ -1007,7 +1007,7 @@ int TDBSDR::FindInDir(PGLOBAL g)
// Start searching files in the target directory.
#if defined(__WIN__)
int
h
=
_findfirst
(
Path
(
g
),
&
FileData
);
int
ptr_t
h
=
_findfirst
(
Path
(
g
),
&
FileData
);
if
(
h
!=
-
1
)
{
for
(
n
=
1
;;
n
++
)
...
...
storage/connect/tabmul.h
View file @
d3f82e3a
...
...
@@ -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
int
ptr_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
int
ptr_t
H
;
// Search handle
#else // !__WIN__
DIR
*
D
;
#endif // !__WIN__
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment