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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9cd15740
Commit
9cd15740
authored
Dec 01, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge gni@bk-internal.mysql.com:/home/bk/mysql-4.1
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb
parents
7c9c5409
4db3e9e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
9 deletions
+23
-9
ndb/src/common/util/File.cpp
ndb/src/common/util/File.cpp
+15
-3
ndb/src/kernel/vm/SimulatedBlock.cpp
ndb/src/kernel/vm/SimulatedBlock.cpp
+8
-6
No files found.
ndb/src/common/util/File.cpp
View file @
9cd15740
...
...
@@ -123,13 +123,25 @@ bool
File_class
::
close
()
{
bool
rc
=
true
;
int
retval
=
0
;
if
(
m_file
!=
NULL
)
{
::
fflush
(
m_file
);
rc
=
(
::
fclose
(
m_file
)
==
0
?
true
:
false
);
m_file
=
NULL
;
// Try again?
retval
=
::
fclose
(
m_file
);
while
(
(
retval
!=
0
)
&&
(
errno
==
EINTR
)
){
retval
=
::
fclose
(
m_file
);
}
if
(
retval
==
0
){
rc
=
true
;
}
else
{
rc
=
false
;
ndbout_c
(
"ERROR: Close file error in File.cpp for %s"
,
strerror
(
errno
));
}
}
m_file
=
NULL
;
return
rc
;
}
...
...
ndb/src/kernel/vm/SimulatedBlock.cpp
View file @
9cd15740
...
...
@@ -658,24 +658,26 @@ SimulatedBlock::allocRecord(const char * type, size_t s, size_t n, bool clear)
void
*
p
=
NULL
;
size_t
size
=
n
*
s
;
Uint64
real_size
=
(
Uint64
)((
Uint64
)
n
)
*
((
Uint64
)
s
);
refresh_watch_dog
();
if
(
size
>
0
){
if
(
real_
size
>
0
){
#ifdef VM_TRACE_MEM
ndbout_c
(
"%s::allocRecord(%s, %u, %u) = %u bytes"
,
ndbout_c
(
"%s::allocRecord(%s, %u, %u) = %
ll
u bytes"
,
getBlockName
(
number
()),
type
,
s
,
n
,
size
);
real_
size
);
#endif
p
=
NdbMem_Allocate
(
size
);
if
(
real_size
==
(
Uint64
)
size
)
p
=
NdbMem_Allocate
(
size
);
if
(
p
==
NULL
){
char
buf1
[
255
];
char
buf2
[
255
];
BaseString
::
snprintf
(
buf1
,
sizeof
(
buf1
),
"%s could not allocate memory for %s"
,
getBlockName
(
number
()),
type
);
BaseString
::
snprintf
(
buf2
,
sizeof
(
buf2
),
"Requested: %ux%u = %u bytes"
,
(
Uint32
)
s
,
(
Uint32
)
n
,
(
Uint
32
)
size
);
BaseString
::
snprintf
(
buf2
,
sizeof
(
buf2
),
"Requested: %ux%u = %
ll
u bytes"
,
(
Uint32
)
s
,
(
Uint32
)
n
,
(
Uint
64
)
real_
size
);
ERROR_SET
(
fatal
,
ERR_MEMALLOC
,
buf1
,
buf2
);
}
...
...
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