diff options
| author | holyfoot@deer.(none) <> | 2006-06-01 17:06:42 +0500 |
|---|---|---|
| committer | holyfoot@deer.(none) <> | 2006-06-01 17:06:42 +0500 |
| commit | bc35c50063a28afeb6c70c22607a76088a1f10cb (patch) | |
| tree | d38087a9ddc2cb5e7182d44fada846bcf265fc41 /libmysqld/libmysqld.c | |
| parent | cb4c6a0dede7873aa151042b5f0aff9f545a5a89 (diff) | |
| download | mariadb-git-bc35c50063a28afeb6c70c22607a76088a1f10cb.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.
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 6fa41fb3fd0..5505049e0e0 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -134,7 +134,6 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, uint port, const char *unix_socket,ulong client_flag) { - char *db_name; char name_buff[USERNAME_LENGTH]; DBUG_ENTER("mysql_real_connect"); @@ -197,13 +196,11 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, port=0; unix_socket=0; - db_name = db ? my_strdup(db,MYF(MY_WME)) : NULL; + mysql->thd= create_embedded_thd(client_flag); - mysql->thd= create_embedded_thd(client_flag, db_name); + init_embedded_mysql(mysql, client_flag); - init_embedded_mysql(mysql, client_flag, db_name); - - if (check_embedded_connection(mysql)) + if (check_embedded_connection(mysql, db)) goto error; if (mysql_init_charset(mysql)) |