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
87fc6265
Commit
87fc6265
authored
Aug 01, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents
15daae5a
340053df
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
innobase/ibuf/ibuf0ibuf.c
innobase/ibuf/ibuf0ibuf.c
+6
-9
No files found.
innobase/ibuf/ibuf0ibuf.c
View file @
87fc6265
...
@@ -945,14 +945,11 @@ ibool
...
@@ -945,14 +945,11 @@ ibool
ibuf_fixed_addr_page
(
ibuf_fixed_addr_page
(
/*=================*/
/*=================*/
/* out: TRUE if a fixed address ibuf i/o page */
/* out: TRUE if a fixed address ibuf i/o page */
ulint
space
,
/* in: space id */
ulint
page_no
)
/* in: page number */
ulint
page_no
)
/* in: page number */
{
{
if
((
ibuf_bitmap_page
(
page_no
))
return
((
space
==
0
&&
page_no
==
IBUF_TREE_ROOT_PAGE_NO
)
||
(
page_no
==
IBUF_TREE_ROOT_PAGE_NO
))
{
||
ibuf_bitmap_page
(
page_no
));
return
(
TRUE
);
}
return
(
FALSE
);
}
}
/***************************************************************************
/***************************************************************************
...
@@ -976,7 +973,7 @@ ibuf_page(
...
@@ -976,7 +973,7 @@ ibuf_page(
return
(
FALSE
);
return
(
FALSE
);
}
}
if
(
ibuf_fixed_addr_page
(
page_no
))
{
if
(
ibuf_fixed_addr_page
(
space
,
page_no
))
{
return
(
TRUE
);
return
(
TRUE
);
}
}
...
@@ -1024,7 +1021,7 @@ ibuf_page_low(
...
@@ -1024,7 +1021,7 @@ ibuf_page_low(
return
(
FALSE
);
return
(
FALSE
);
}
}
#endif
#endif
if
(
ibuf_fixed_addr_page
(
page_no
))
{
if
(
ibuf_fixed_addr_page
(
space
,
page_no
))
{
return
(
TRUE
);
return
(
TRUE
);
}
}
...
@@ -2931,7 +2928,7 @@ ibuf_merge_or_delete_for_page(
...
@@ -2931,7 +2928,7 @@ ibuf_merge_or_delete_for_page(
return
;
return
;
}
}
#endif
#endif
if
(
ibuf_fixed_addr_page
(
page_no
)
||
fsp_descr_page
(
page_no
)
if
(
ibuf_fixed_addr_page
(
space
,
page_no
)
||
fsp_descr_page
(
page_no
)
||
trx_sys_hdr_page
(
space
,
page_no
))
{
||
trx_sys_hdr_page
(
space
,
page_no
))
{
return
;
return
;
}
}
...
...
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