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
472ff94b
Commit
472ff94b
authored
Jan 11, 2007
by
Kristofer.Pettersson@naruto
Browse files
Options
Browse Files
Download
Plain Diff
Merge naruto.:C:/cpp/bug24751/my41-bug24751
into naruto.:C:/cpp/mysql-4.1-maint
parents
26c0934e
27075265
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
mysys/mf_iocache.c
mysys/mf_iocache.c
+4
-3
No files found.
mysys/mf_iocache.c
View file @
472ff94b
...
@@ -199,11 +199,11 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize,
...
@@ -199,11 +199,11 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize,
if
(
type
!=
READ_NET
&&
type
!=
WRITE_NET
)
if
(
type
!=
READ_NET
&&
type
!=
WRITE_NET
)
{
{
/* Retry allocating memory in smaller blocks until we get one */
/* Retry allocating memory in smaller blocks until we get one */
cachesize
=
(
uint
)
((
ulong
)
(
cachesize
+
min_cache
-
1
)
&
(
ulong
)
~
(
min_cache
-
1
));
for
(;;)
for
(;;)
{
{
uint
buffer_block
;
uint
buffer_block
;
cachesize
=
(
uint
)
((
ulong
)
(
cachesize
+
min_cache
-
1
)
&
(
ulong
)
~
(
min_cache
-
1
));
if
(
cachesize
<
min_cache
)
if
(
cachesize
<
min_cache
)
cachesize
=
min_cache
;
cachesize
=
min_cache
;
buffer_block
=
cachesize
;
buffer_block
=
cachesize
;
...
@@ -222,7 +222,8 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize,
...
@@ -222,7 +222,8 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize,
}
}
if
(
cachesize
==
min_cache
)
if
(
cachesize
==
min_cache
)
DBUG_RETURN
(
2
);
/* Can't alloc cache */
DBUG_RETURN
(
2
);
/* Can't alloc cache */
cachesize
=
(
uint
)
((
long
)
cachesize
*
3
/
4
);
/* Try with less memory */
/* Try with less memory */
cachesize
=
(
uint
)
((
ulong
)
cachesize
*
3
/
4
&
(
ulong
)
~
(
min_cache
-
1
));
}
}
}
}
...
...
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