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
42ff786c
Commit
42ff786c
authored
13 years ago
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1 to mysql-5.5.
parents
73312bdd
49ee12d0
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
extra/innochecksum.c
extra/innochecksum.c
+1
-7
storage/innobase/sync/sync0sync.c
storage/innobase/sync/sync0sync.c
+7
-1
No files found.
extra/innochecksum.c
View file @
42ff786c
...
...
@@ -25,12 +25,7 @@
Published with a permission.
*/
/* needed to have access to 64 bit file functions */
#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
#define _XOPEN_SOURCE 500
/* needed to include getopt.h on some platforms. */
#include <my_global.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
...
...
@@ -53,7 +48,6 @@
/* another argument to specify page ranges... seek to right spot and go from there */
typedef
unsigned
long
int
ulint
;
typedef
unsigned
char
uchar
;
/* innodb function in name; modified slightly to not have the ASM version (lots of #ifs that didn't apply) */
ulint
mach_read_from_4
(
uchar
*
b
)
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/sync/sync0sync.c
View file @
42ff786c
...
...
@@ -1329,7 +1329,13 @@ sync_thread_add_level(
TRUE
));
break
;
case
SYNC_IBUF_TREE_NODE_NEW
:
ut_a
(
sync_thread_levels_contain
(
array
,
SYNC_IBUF_MUTEX
));
/* ibuf_add_free_page() allocates new pages for the
change buffer while only holding the tablespace
x-latch. These pre-allocated new pages may only be
taken in use while holding ibuf_mutex, in
btr_page_alloc_for_ibuf(). */
ut_a
(
sync_thread_levels_contain
(
array
,
SYNC_IBUF_MUTEX
)
||
sync_thread_levels_contain
(
array
,
SYNC_FSP
));
break
;
case
SYNC_IBUF_INDEX_TREE
:
if
(
sync_thread_levels_contain
(
array
,
SYNC_FSP
))
{
...
...
This diff is collapsed.
Click to expand it.
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