database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

SCRUM

Browse Source 
embedded library
missed memory freeing added
This commit is contained in:
hf@deer.(none)
2003-09-19 14:17:55 +05:00
parent cda32e123c
commit 0868446b3e
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysqld/embedded_priv.h
View File

@ -26,6 +26,7 @@ C_MODE_START
extern void lib_connection_phase(NET *net, int phase); extern void lib_connection_phase(NET *net, int phase);
extern void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db); extern void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
extern void *create_embedded_thd(int client_flag, char *db); extern void *create_embedded_thd(int client_flag, char *db);
extern void free_embedded_thd(MYSQL *mysql);
extern MYSQL_METHODS embedded_methods; extern MYSQL_METHODS embedded_methods;
void free_old_query(MYSQL *mysql); void free_old_query(MYSQL *mysql);
extern my_bool server_inited; extern my_bool server_inited;

10
libmysqld/lib_sql.cc
View File

@ -474,6 +474,16 @@ void *create_embedded_thd(int client_flag, char *db)
return thd; return thd;
} }
void free_embedded_thd(MYSQL *mysql)
{
THD *thd= (THD*)mysql->thd;
if (!thd)
return;
if (thd->data)
free_rows(thd->data);
delete thd;
}
C_MODE_END C_MODE_END
bool Protocol::send_fields(List<Item> *list, uint flag) bool Protocol::send_fields(List<Item> *list, uint flag)

3
libmysqld/libmysqld.c
View File

@ -289,6 +289,9 @@ void STDCALL mysql_close(MYSQL *mysql)
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
if (mysql->free_me) if (mysql->free_me)
my_free((gptr) mysql,MYF(0)); my_free((gptr) mysql,MYF(0));
free_embedded_thd(mysql);
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }