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
899e600b
Commit
899e600b
authored
Mar 28, 2012
by
Sunny Bains
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.0
parents
efc29bc5
0ebe1273
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
storage/innobase/include/trx0purge.h
storage/innobase/include/trx0purge.h
+2
-2
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0purge.c
+2
-2
storage/innodb_plugin/include/trx0purge.h
storage/innodb_plugin/include/trx0purge.h
+2
-2
storage/innodb_plugin/trx/trx0purge.c
storage/innodb_plugin/trx/trx0purge.c
+2
-2
No files found.
storage/innobase/include/trx0purge.h
View file @
899e600b
...
...
@@ -120,9 +120,9 @@ struct trx_purge_struct{
read_view_t
*
view
;
/* The purge will not remove undo logs
which are >= this view (purge view) */
mutex_t
mutex
;
/* Mutex protecting the fields below */
ul
int
n_pages_handled
;
/* Approximate number of undo log
ul
onglong
n_pages_handled
;
/* Approximate number of undo log
pages processed in purge */
ul
int
handle_limit
;
/* Target of how many pages to get
ul
onglong
handle_limit
;
/* Target of how many pages to get
processed in the current purge */
/*------------------------------*/
/* The following two fields form the 'purge pointer' which advances
...
...
storage/innobase/trx/trx0purge.c
View file @
899e600b
...
...
@@ -1022,7 +1022,7 @@ trx_purge(void)
{
que_thr_t
*
thr
;
/* que_thr_t* thr2; */
ul
int
old_pages_handled
;
ul
onglong
old_pages_handled
;
mutex_enter
(
&
(
purge_sys
->
mutex
));
...
...
@@ -1116,7 +1116,7 @@ trx_purge(void)
(
ulong
)
purge_sys
->
n_pages_handled
);
}
return
(
purge_sys
->
n_pages_handled
-
old_pages_handled
);
return
(
(
ulint
)
(
purge_sys
->
n_pages_handled
-
old_pages_handled
)
);
}
/**********************************************************************
...
...
storage/innodb_plugin/include/trx0purge.h
View file @
899e600b
...
...
@@ -140,9 +140,9 @@ struct trx_purge_struct{
read_view_t
*
view
;
/*!< The purge will not remove undo logs
which are >= this view (purge view) */
mutex_t
mutex
;
/*!< Mutex protecting the fields below */
ul
int
n_pages_handled
;
/*!< Approximate number of undo log
ul
onglong
n_pages_handled
;
/*!< Approximate number of undo log
pages processed in purge */
ul
int
handle_limit
;
/*!< Target of how many pages to get
ul
onglong
handle_limit
;
/*!< Target of how many pages to get
processed in the current purge */
/*------------------------------*/
/* The following two fields form the 'purge pointer' which advances
...
...
storage/innodb_plugin/trx/trx0purge.c
View file @
899e600b
...
...
@@ -1085,7 +1085,7 @@ trx_purge(void)
{
que_thr_t
*
thr
;
/* que_thr_t* thr2; */
ul
int
old_pages_handled
;
ul
onglong
old_pages_handled
;
mutex_enter
(
&
(
purge_sys
->
mutex
));
...
...
@@ -1179,7 +1179,7 @@ trx_purge(void)
(
ulong
)
purge_sys
->
n_pages_handled
);
}
return
(
purge_sys
->
n_pages_handled
-
old_pages_handled
);
return
(
(
ulint
)
(
purge_sys
->
n_pages_handled
-
old_pages_handled
)
);
}
/******************************************************************//**
...
...
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