summaryrefslogtreecommitdiff
path: root/libmysql/client_settings.h
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2004-09-22 15:50:07 +0400
committerunknown <konstantin@mysql.com>2004-09-22 15:50:07 +0400
commitccf52b4fd5bd7ae0a418d22f2758cef345b6afa6 (patch)
treee9e451c78db8c48bfcfbf6943d785f85d1b8a6f8 /libmysql/client_settings.h
parentd594d40d119fd536657be3b1523bd5b48f15fa1e (diff)
downloadmariadb-git-ccf52b4fd5bd7ae0a418d22f2758cef345b6afa6.tar.gz
A fix and test case for Bug#5315 "mysql_change_user() doesn't free
prepared statements." include/hash.h: New declaration for hash_reset() function. The old version was not used. libmysql/client_settings.h: Declaration for mysql_detach_stmt_list(). libmysql/libmysql.c: Fix for bug#5315 "mysql_change_user() doesn't free prepared statements": add call to mysql_detach_stmt_list(prepared statements) to mysql_change_user(): all statements are freed by server, so client counterparts need to be marked as not usable. mysys/hash.c: Fix for bug#5315 "mysql_change_user() doesn't free prepared statements": implementation of hash_reset(), which frees all hash elements and prepares the hash for reuse. sql-common/client.c: Fix for bug#5315 "mysql_change_user() doesn't free prepared statements": implementation of mysql_detach_stmt_list(): zero connection pointer in given statement list, thus marking given statements as not usable. sql/sql_class.cc: Fix for bug#5315 "mysql_change_user() doesn't free prepared statements": reset prepared statements map in THD::change_user(). sql/sql_class.h: Fix for bug#5315 "mysql_change_user() doesn't free prepared statements": implementation of Statement_map::reset(). A little cleanup of ~Statement_map(): first empty names_hash, as st_hash has a free function, which will delete statements. tests/client_test.c: A test case for bug #5315 "mysql_change_user() doesn't free prepared statements".
Diffstat (limited to 'libmysql/client_settings.h')
-rw-r--r--libmysql/client_settings.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index 5857c0c84d6..552307733ea 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -42,6 +42,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename);
void mysql_read_default_options(struct st_mysql_options *options,
const char *filename,const char *group);
+void mysql_detach_stmt_list(LIST **stmt_list);
MYSQL * STDCALL
cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
const char *passwd, const char *db,