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
80d164c8
Commit
80d164c8
authored
Nov 03, 2004
by
guilhem@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
parents
613c98ce
13a60a76
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
innobase/ibuf/ibuf0ibuf.c
innobase/ibuf/ibuf0ibuf.c
+4
-2
No files found.
innobase/ibuf/ibuf0ibuf.c
View file @
80d164c8
...
@@ -2866,6 +2866,8 @@ ibuf_delete_rec(
...
@@ -2866,6 +2866,8 @@ ibuf_delete_rec(
#ifdef UNIV_IBUF_DEBUG
#ifdef UNIV_IBUF_DEBUG
ibuf_count_set
(
space
,
page_no
,
ibuf_count_get
(
space
,
page_no
)
-
1
);
ibuf_count_set
(
space
,
page_no
,
ibuf_count_get
(
space
,
page_no
)
-
1
);
#else
UT_NOT_USED
(
space
);
#endif
#endif
ibuf_data_sizes_update
(
ibuf_data
,
root
,
mtr
);
ibuf_data_sizes_update
(
ibuf_data
,
root
,
mtr
);
...
@@ -3267,11 +3269,11 @@ ibuf_delete_for_discarded_space(
...
@@ -3267,11 +3269,11 @@ ibuf_delete_for_discarded_space(
ibuf_data
->
n_merged_recs
+=
n_inserts
;
ibuf_data
->
n_merged_recs
+=
n_inserts
;
mutex_exit
(
&
ibuf_mutex
);
mutex_exit
(
&
ibuf_mutex
);
/*
fprintf(stderr,
fprintf(stderr,
"InnoDB: Discarded %lu ibuf entries for space %lu\n",
"InnoDB: Discarded %lu ibuf entries for space %lu\n",
(ulong) n_inserts, (ulong) space);
(ulong) n_inserts, (ulong) space);
*/
ibuf_exit
();
ibuf_exit
();
mem_heap_free
(
heap
);
mem_heap_free
(
heap
);
...
...
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