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
2a0caafc
Commit
2a0caafc
authored
Aug 21, 2004
by
mronstrom@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor changes for WL 2056
parent
7c1eb264
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
ndb/src/common/portlib/NdbMem.c
ndb/src/common/portlib/NdbMem.c
+4
-1
ndb/src/common/util/new.cpp
ndb/src/common/util/new.cpp
+5
-4
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+1
-1
No files found.
ndb/src/common/portlib/NdbMem.c
View file @
2a0caafc
...
...
@@ -31,10 +31,13 @@ void NdbMem_Destroy()
return
;
}
void
*
NdbMem_Allocate
(
size_t
size
)
{
void
*
mem_allocated
;
assert
(
size
>
0
);
return
(
void
*
)
malloc
(
size
);
mem_allocated
=
(
void
*
)
malloc
(
size
);
return
mem_allocated
;
}
void
*
NdbMem_AllocateAlign
(
size_t
size
,
size_t
alignment
)
...
...
ndb/src/common/util/new.cpp
View file @
2a0caafc
#include <ndb_global.h>
#include <NdbMem.h>
extern
"C"
{
void
(
*
ndb_new_handler
)()
=
0
;
...
...
@@ -9,7 +10,7 @@ extern "C" {
void
*
operator
new
(
size_t
sz
)
{
void
*
p
=
malloc
(
sz
?
sz
:
1
);
void
*
p
=
NdbMem_Allocate
(
sz
?
sz
:
1
);
if
(
p
)
return
p
;
if
(
ndb_new_handler
)
...
...
@@ -19,7 +20,7 @@ void *operator new (size_t sz)
void
*
operator
new
[]
(
size_t
sz
)
{
void
*
p
=
(
void
*
)
malloc
(
sz
?
sz
:
1
);
void
*
p
=
(
void
*
)
NdbMem_Allocate
(
sz
?
sz
:
1
);
if
(
p
)
return
p
;
if
(
ndb_new_handler
)
...
...
@@ -30,13 +31,13 @@ void *operator new[] (size_t sz)
void
operator
delete
(
void
*
ptr
)
{
if
(
ptr
)
f
ree
(
ptr
);
NdbMem_F
ree
(
ptr
);
}
void
operator
delete
[]
(
void
*
ptr
)
throw
()
{
if
(
ptr
)
f
ree
(
ptr
);
NdbMem_F
ree
(
ptr
);
}
#endif // USE_MYSYS_NEW
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
View file @
2a0caafc
...
...
@@ -67,7 +67,7 @@ Ndbfs::Ndbfs(const Configuration & conf) :
//ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);
// Create idle AsyncFiles
Uint32
noIdleFiles
=
16
;
Uint32
noIdleFiles
=
27
;
for
(
Uint32
i
=
0
;
i
<
noIdleFiles
;
i
++
){
theIdleFiles
.
push_back
(
createAsyncFile
());
}
...
...
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