From 8b714e507f9e2c216ad043a10db99ea558e9285b Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 17 Apr 2013 23:37:06 +0300 Subject: Changed the client library to only mark memory as THREAD_SPECIFIC if one has called mysql_options() with MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY include/mysql.h: Added MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY include/mysql.h.pp: Updated file sql-common/client.c: Marked client memory as THREAD_SPECIFIC sql/event_db_repository.cc: Fixed compiler warning sql/slave.cc: Marked client memory as THREAD_SPECIFIC storage/federatedx/federatedx_io_mysql.cc: Marked client memory as THREAD_SPECIFIC storage/federatedx/ha_federatedx.cc: Marked client memory as THREAD_SPECIFIC storage/sphinx/ha_sphinx.cc: Marked client memory as THREAD_SPECIFIC --- include/mysql.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/mysql.h') diff --git a/include/mysql.h b/include/mysql.h index fa62026b44a..122b5a2751f 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -169,7 +169,7 @@ enum mysql_option MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, MYSQL_PROGRESS_CALLBACK, /* MariaDB options */ - MYSQL_OPT_NONBLOCK=6000 + MYSQL_OPT_NONBLOCK=6000, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY }; /** @@ -194,7 +194,7 @@ struct st_mysql_options { unsigned long max_allowed_packet; my_bool use_ssl; /* if to use SSL or not */ my_bool compress,named_pipe; - my_bool unused1; + my_bool use_thread_specific_memory; my_bool unused2; my_bool unused3; my_bool unused4; -- cgit v1.2.1