diff options
author | unknown <holyfoot@deer.(none)> | 2006-06-01 17:06:42 +0500 |
---|---|---|
committer | unknown <holyfoot@deer.(none)> | 2006-06-01 17:06:42 +0500 |
commit | eadcf20081b18b28f344552a9902fea2404d55bd (patch) | |
tree | d38087a9ddc2cb5e7182d44fada846bcf265fc41 /libmysqld/embedded_priv.h | |
parent | b29e052dbfe5021fefb5d312860a4980c851c24b (diff) | |
download | mariadb-git-eadcf20081b18b28f344552a9902fea2404d55bd.tar.gz |
bug #16017 (memory leaks in embedded server)
There actually was 3 different problems -
hash_user_connections wasn't cleaned
one strdupped database name wasn't freed
and stmt->mem_root wasn't cleaned as it was
replased with mysql->field_alloc for result
For the last one - i made the library using stmt's
fields to store result if it's the case.
include/mysql.h:
statement pointer added to the advanced_command to be checked in
embedded server
include/sql_common.h:
stmt added to the cli_advanced_command interface
libmysql/libmysql.c:
stmt pointer now sent to advanced_command
libmysqld/embedded_priv.h:
it's enough to send database name to check_embedded_connection
libmysqld/lib_sql.cc:
Now we store result directly in the MYSQL_STMT structure to
avoid extra copying
libmysqld/libmysqld.c:
it's enough to only send database pointer to check_embedded_connection
sql-common/client.c:
stmt fake attribute added to cli_advanced_command
sql/sql_parse.cc:
hash_user_connections isn't used if no access checks compiled
Diffstat (limited to 'libmysqld/embedded_priv.h')
-rw-r--r-- | libmysqld/embedded_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h index d4316dff63f..1e1db071b33 100644 --- a/libmysqld/embedded_priv.h +++ b/libmysqld/embedded_priv.h @@ -24,9 +24,9 @@ C_MODE_START void lib_connection_phase(NET *net, int phase); -void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db); -void *create_embedded_thd(int client_flag, char *db); -int check_embedded_connection(MYSQL *mysql); +void init_embedded_mysql(MYSQL *mysql, int client_flag); +void *create_embedded_thd(int client_flag); +int check_embedded_connection(MYSQL *mysql, const char *db); void free_old_query(MYSQL *mysql); void embedded_get_error(MYSQL *mysql); extern MYSQL_METHODS embedded_methods; |