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
dfefc15d
Commit
dfefc15d
authored
14 years ago
by
Michael Widenius
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge with 5.1-release
parents
a9243256
6120fbac
Branches unavailable
Tags unavailable
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
7 deletions
+3
-7
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.c
+0
-1
storage/maria/unittest/ma_pagecache_consist.c
storage/maria/unittest/ma_pagecache_consist.c
+1
-0
storage/maria/unittest/ma_pagecache_rwconsist.c
storage/maria/unittest/ma_pagecache_rwconsist.c
+1
-0
storage/maria/unittest/ma_test_loghandler_multithread-t.c
storage/maria/unittest/ma_test_loghandler_multithread-t.c
+0
-5
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
+1
-1
No files found.
storage/maria/ma_pagecache.c
View file @
dfefc15d
...
...
@@ -1046,7 +1046,6 @@ static inline void dec_counter_for_resize_op(PAGECACHE *pagecache)
(
"thread %ld"
,
last_thread
->
next
->
id
));
pagecache_pthread_cond_signal
(
&
last_thread
->
next
->
suspend
);
}
DBUG_ASSERT
((
longlong
)
pagecache
->
cnt_for_resize_op
>=
0
);
#else
pagecache
->
cnt_for_resize_op
--
;
#endif
...
...
This diff is collapsed.
Click to expand it.
storage/maria/unittest/ma_pagecache_consist.c
View file @
dfefc15d
...
...
@@ -476,6 +476,7 @@ int main(int argc __attribute__((unused)),
pthread_mutex_unlock
(
&
LOCK_thread_count
);
DBUG_PRINT
(
"info"
,
(
"thread ended"
));
flush_pagecache_blocks
(
&
pagecache
,
&
file1
,
FLUSH_IGNORE_CHANGED
);
end_pagecache
(
&
pagecache
,
1
);
DBUG_PRINT
(
"info"
,
(
"Page cache ended"
));
...
...
This diff is collapsed.
Click to expand it.
storage/maria/unittest/ma_pagecache_rwconsist.c
View file @
dfefc15d
...
...
@@ -341,6 +341,7 @@ int main(int argc __attribute__((unused)),
pthread_mutex_unlock
(
&
LOCK_thread_count
);
DBUG_PRINT
(
"info"
,
(
"thread ended"
));
flush_pagecache_blocks
(
&
pagecache
,
&
file1
,
FLUSH_IGNORE_CHANGED
);
end_pagecache
(
&
pagecache
,
1
);
DBUG_PRINT
(
"info"
,
(
"Page cache ended"
));
...
...
This diff is collapsed.
Click to expand it.
storage/maria/unittest/ma_test_loghandler_multithread-t.c
View file @
dfefc15d
...
...
@@ -269,11 +269,6 @@ int main(int argc __attribute__((unused)),
int
*
param
,
error
;
int
rc
;
/* Disabled until Sanja tests */
plan
(
1
);
ok
(
1
,
"disabled"
);
exit
(
0
);
plan
(
WRITERS
+
FLUSHERS
+
ITERATIONS
*
WRITERS
*
3
+
FLUSH_ITERATIONS
*
FLUSHERS
);
...
...
This diff is collapsed.
Click to expand it.
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
View file @
dfefc15d
...
...
@@ -168,7 +168,7 @@ int main(int argc __attribute__((unused)), char *argv[])
PAGECACHE_PIN_LEFT_UNPINNED
,
PAGECACHE_WRITE_DELAY
,
0
,
LSN_IMPOSSIBLE
);
flush_pagecache_blocks
(
&
pagecache
,
&
file1
,
FLUSH_
FORCE_WRIT
E
);
flush_pagecache_blocks
(
&
pagecache
,
&
file1
,
FLUSH_
RELEAS
E
);
}
my_close
(
file1
.
file
,
MYF
(
MY_WME
));
if
((
file1
.
file
=
my_open
(
first_translog_file
,
O_RDONLY
,
MYF
(
MY_WME
)))
<
0
)
...
...
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