summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-06-19 22:57:46 +0300
committerMichael Widenius <monty@askmonty.org>2013-06-19 22:57:46 +0300
commitf62f4bd563a96ddd78b78d563e4d4cf5ad27aae1 (patch)
tree17d34be40ccafdbb0ffee956c87aa86bf3aef3fc /sql/sql_prepare.cc
parentdfcc502ab540b4d93fe3d40d0bac15fa3ae449dd (diff)
downloadmariadb-git-f62f4bd563a96ddd78b78d563e4d4cf5ad27aae1.tar.gz
Fixed some memory leaks
Disabled some asserts that we can't yet have enabled
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index f3c6023de70..85f89fc185a 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2993,7 +2993,7 @@ void mysql_stmt_get_longdata(THD *thd, char *packet, ulong packet_length)
param= stmt->param_array[param_number];
- Diagnostics_area new_stmt_da(thd->query_id, false);
+ Diagnostics_area new_stmt_da(thd->query_id, false, true);
Diagnostics_area *save_stmt_da= thd->get_stmt_da();
thd->set_stmt_da(&new_stmt_da);
@@ -4066,7 +4066,7 @@ Ed_result_set::Ed_result_set(List<Ed_row> *rows_arg,
*/
Ed_connection::Ed_connection(THD *thd)
- :m_diagnostics_area(thd->query_id, false),
+ :m_diagnostics_area(thd->query_id, false, true),
m_thd(thd),
m_rsets(0),
m_current_rset(0)