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 | |
| parent | a1cd28e2e54d32dc70280875bab7f0d35e9370c4 (diff) | |
| parent | 71c211d48bafaf3e7fe1283b7a01b312ca8c8db1 (diff) | |
| download | mariadb-git-f9dcd5b540ca0bdf7dfac56a87c9c9153d4589d3.tar.gz | |
10.0-base merge
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/mysql.h b/include/mysql.h index c761938c39b..69fc8005d61 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -172,8 +172,9 @@ enum mysql_option MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER, MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH, /* MariaDB options */ - MYSQL_OPT_NONBLOCK=6000, - MYSQL_PROGRESS_CALLBACK + MYSQL_PROGRESS_CALLBACK=5999, + MYSQL_OPT_NONBLOCK, + MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY }; /** @@ -198,7 +199,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; |