diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-04-17 23:37:06 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-04-17 23:37:06 +0300 |
| commit | 8b714e507f9e2c216ad043a10db99ea558e9285b (patch) | |
| tree | c73d5355619001021e0426fa1a955bf68f90fc5d /include/mysql.h.pp | |
| parent | 8e526985800678de20356cece1183f49f69c26f9 (diff) | |
| download | mariadb-git-8b714e507f9e2c216ad043a10db99ea558e9285b.tar.gz | |
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
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 331183180c0..b3a56dfd90b 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -83,7 +83,7 @@ enum enum_mysql_set_option my_bool my_net_init(NET *net, Vio* vio, unsigned int my_flags); void my_net_local_init(NET *net); void net_end(NET *net); - void net_clear(NET *net, my_bool clear_buffer); +void net_clear(NET *net, my_bool clear_buffer); my_bool net_realloc(NET *net, size_t length); my_bool net_flush(NET *net); my_bool my_net_write(NET *net,const unsigned char *packet, size_t len); @@ -263,7 +263,7 @@ enum mysql_option MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, MYSQL_PROGRESS_CALLBACK, - MYSQL_OPT_NONBLOCK=6000 + MYSQL_OPT_NONBLOCK=6000, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY }; struct st_mysql_options_extention; struct st_mysql_options { @@ -282,7 +282,7 @@ struct st_mysql_options { unsigned long max_allowed_packet; my_bool use_ssl; my_bool compress,named_pipe; - my_bool unused1; + my_bool use_thread_specific_memory; my_bool unused2; my_bool unused3; my_bool unused4; |