diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-18 21:54:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-18 21:54:13 +0200 |
| commit | f9dcd5b540ca0bdf7dfac56a87c9c9153d4589d3 (patch) | |
| tree | 33413cf05738a3cd21014bd50d9dae5b3a879789 /include/mysql.h.pp | |
| parent | a1cd28e2e54d32dc70280875bab7f0d35e9370c4 (diff) | |
| parent | 71c211d48bafaf3e7fe1283b7a01b312ca8c8db1 (diff) | |
| download | mariadb-git-f9dcd5b540ca0bdf7dfac56a87c9c9153d4589d3.tar.gz | |
10.0-base merge
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index f2bb110a3e7..d33822b2021 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); @@ -266,8 +266,9 @@ enum mysql_option MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT, MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER, MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH, - MYSQL_OPT_NONBLOCK=6000, - MYSQL_PROGRESS_CALLBACK + MYSQL_PROGRESS_CALLBACK=5999, + MYSQL_OPT_NONBLOCK, + MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY }; struct st_mysql_options_extention; struct st_mysql_options { @@ -286,7 +287,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; |