database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

short patch for bug #2184 'Prepared statements in embedded library was

Browse Source 
broken with recent changes' (attempt 2).
Adding Statement_core is better because:
- set_statement() code is shorter and you don't need to modify it when adding
new members to Statement_core
- a bit faster (you don't have virtual call and don't free_root() twice)
Do that short patch instead in hope that set_statement() will be sooner or
later removed entirely


sql/sql_class.cc:
  short patch for bug #2184 'Prepared statements in embedded library was 
  broken with recent changes'
sql/sql_class.h:
  short patch for bug #2184 'Prepared statements in embedded library 
  was broken with recent changes'
This commit is contained in:
unknown
2003-12-23 15:38:19 +03:00
parent 37d11ff858
commit 923af04fc1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@@ -336,6 +336,8 @@ THD::~THD()
#ifndef DBUG_OFF #ifndef DBUG_OFF
dbug_sentry = THD_SENTRY_GONE; dbug_sentry = THD_SENTRY_GONE;
#endif #endif
/* Reset stmt_backup.mem_root to not double-free memory from thd.mem_root */
init_alloc_root(&stmt_backup.mem_root, 0, 0);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

3
sql/sql_class.h
View File

@@ -582,8 +582,7 @@ public:
Statement_map stmt_map; Statement_map stmt_map;
/* /*
keeps THD state while it is used for active statement keeps THD state while it is used for active statement
Note, that double free_root() is safe, so we don't need to do any Note: we perform special cleanup for it in THD destructor.
special cleanup for it in THD destructor.
*/ */
Statement stmt_backup; Statement stmt_backup;
/* /*