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
6fa0ed40
Commit
6fa0ed40
authored
Sep 27, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0
parents
706731cf
912317f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
22 deletions
+3
-22
innobase/buf/buf0flu.c
innobase/buf/buf0flu.c
+2
-2
innobase/srv/srv0start.c
innobase/srv/srv0start.c
+1
-1
innobase/trx/trx0sys.c
innobase/trx/trx0sys.c
+0
-19
No files found.
innobase/buf/buf0flu.c
View file @
6fa0ed40
...
...
@@ -230,7 +230,7 @@ buf_flush_buffered_writes(void)
ulint
len2
;
ulint
i
;
if
(
trx_doublewrite
==
NULL
)
{
if
(
!
srv_use_doublewrite_buf
||
trx_doublewrite
==
NULL
)
{
os_aio_simulated_wake_handler_threads
();
return
;
...
...
@@ -503,7 +503,7 @@ buf_flush_write_block_low(
#endif
buf_flush_init_for_writing
(
block
->
frame
,
block
->
newest_modification
,
block
->
space
,
block
->
offset
);
if
(
!
trx_doublewrite
)
{
if
(
!
srv_use_doublewrite_buf
||
!
trx_doublewrite
)
{
fil_io
(
OS_FILE_WRITE
|
OS_AIO_SIMULATED_WAKE_LATER
,
FALSE
,
block
->
space
,
block
->
offset
,
0
,
UNIV_PAGE_SIZE
,
(
void
*
)
block
->
frame
,
(
void
*
)
block
);
...
...
innobase/srv/srv0start.c
View file @
6fa0ed40
...
...
@@ -1540,7 +1540,7 @@ NetWare. */
#endif
sync_order_checks_on
=
TRUE
;
if
(
srv_use_doublewrite_buf
&&
trx_doublewrite
==
NULL
)
{
if
(
trx_doublewrite
==
NULL
)
{
/* Create the doublewrite buffer to a new tablespace */
trx_sys_create_doublewrite_buf
();
...
...
innobase/trx/trx0sys.c
View file @
6fa0ed40
...
...
@@ -125,22 +125,6 @@ trx_doublewrite_init(
*
sizeof
(
void
*
));
}
/********************************************************************
Frees the doublewrite buffer. */
static
void
trx_doublewrite_free
(
void
)
/*======================*/
{
mutex_free
(
&
(
trx_doublewrite
->
mutex
));
mem_free
(
trx_doublewrite
->
buf_block_arr
);
ut_free
(
trx_doublewrite
->
write_buf_unaligned
);
mem_free
(
trx_doublewrite
);
trx_doublewrite
=
NULL
;
}
/********************************************************************
Marks the trx sys header when we have successfully upgraded to the >= 4.1.x
multiple tablespace format. */
...
...
@@ -529,9 +513,6 @@ trx_sys_doublewrite_init_or_restore_pages(
fil_flush_file_spaces
(
FIL_TABLESPACE
);
if
(
!
srv_use_doublewrite_buf
)
trx_doublewrite_free
();
leave_func:
ut_free
(
unaligned_read_buf
);
}
...
...
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