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
182ffc0c
Commit
182ffc0c
authored
Dec 09, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove #ifdef ENABLE_BEFORE_END_OF_MERGE_QQ
parent
517b1f4f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
6 deletions
+0
-6
sql/mysqld.cc
sql/mysqld.cc
+0
-4
sql/sql_class.cc
sql/sql_class.cc
+0
-2
No files found.
sql/mysqld.cc
View file @
182ffc0c
...
...
@@ -3815,17 +3815,13 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific)
However, this should never happen, so better to assert and
fix this.
*/
#ifdef ENABLE_BEFORE_END_OF_MERGE_QQ
DBUG_ASSERT
(
thd
);
#endif
if
(
thd
)
{
DBUG_PRINT
(
"info"
,
(
"memory_used: %lld size: %lld"
,
(
longlong
)
thd
->
status_var
.
memory_used
,
size
));
thd
->
status_var
.
memory_used
+=
size
;
#ifdef ENABLE_BEFORE_END_OF_MERGE_QQ
DBUG_ASSERT
((
longlong
)
thd
->
status_var
.
memory_used
>=
0
);
#endif
}
}
}
...
...
sql/sql_class.cc
View file @
182ffc0c
...
...
@@ -1631,9 +1631,7 @@ THD::~THD()
{
DBUG_PRINT
(
"error"
,
(
"memory_used: %lld"
,
status_var
.
memory_used
));
SAFEMALLOC_REPORT_MEMORY
(
my_thread_dbug_id
());
#ifdef ENABLE_BEFORE_END_OF_MERGE_QQ
DBUG_ASSERT
(
status_var
.
memory_used
==
0
);
// Ensure everything is freed
#endif
}
set_current_thd
(
orig_thd
);
...
...
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