database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

10.0-base merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-04-18 21:54:13 +02:00
parent a1cd28e2e5 71c211d48b
commit f9dcd5b540
29 changed files with 116 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/mysql.h
View File

@@ -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;