diff options
| author | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
| commit | 46cb15ccd477007c8ba2abaa90f86960a8adc7bd (patch) | |
| tree | 8bec4511106588d39e833346b08272d3d00f72ee /include/mysql.h | |
| parent | ef726bbff367ab6c5aa735655d8ff6c3fdccdb7d (diff) | |
| parent | a4792eefad19e4f70471952afedef2221fbfbd64 (diff) | |
| download | mariadb-git-46cb15ccd477007c8ba2abaa90f86960a8adc7bd.tar.gz | |
SCRUM
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
include/mysql_com.h:
Auto merged
include/sql_common.h:
Auto merged
include/mysql.h:
conflicts merged
libmysql/client_settings.h:
conflicts merged
libmysql/libmysql.c:
conflicts merged
sql-common/client.c:
conflicts merged
sql/client_settings.h:
conflicts merged
sql/protocol.cc:
conflict merged
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/include/mysql.h b/include/mysql.h index 255570d3488..81e50525614 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -135,9 +135,9 @@ typedef struct st_mysql_data { } MYSQL_DATA; struct st_mysql_options { - unsigned int connect_timeout; + unsigned int connect_timeout, read_timeout, write_timeout; + unsigned int port, protocol; unsigned long client_flag; - unsigned int port; char *host,*user,*password,*unix_socket,*db; struct st_dynamic_array *init_commands; char *my_cnf_file,*my_cnf_group, *charset_dir, *charset_name; @@ -146,6 +146,7 @@ struct st_mysql_options { char *ssl_ca; /* PEM CA file */ char *ssl_capath; /* PEM directory of CA-s? */ char *ssl_cipher; /* cipher to use */ + char *shared_memory_base_name; unsigned long max_allowed_packet; my_bool use_ssl; /* if to use SSL or not */ my_bool compress,named_pipe; @@ -167,18 +168,15 @@ struct st_mysql_options { #if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY) my_bool separate_thread; #endif - char *shared_memory_base_name; - unsigned int protocol; }; enum mysql_option { - MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND, - MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, - MYSQL_OPT_LOCAL_INFILE, MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME -#if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY) - , MYSQL_OPT_USE_RESULT -#endif + MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE, + MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP, + MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE, + MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME, MYSQL_OPT_READ_TIMEOUT, + MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT }; enum mysql_status @@ -188,8 +186,8 @@ enum mysql_status enum mysql_protocol_type { - MYSQL_PROTOCOL_DEFAULT, MYSQL_PROTOCOL_TCP, MYSQL_PROTOCOL_SOCKET, MYSQL_PROTOCOL_PIPE, - MYSQL_PROTOCOL_MEMORY + MYSQL_PROTOCOL_DEFAULT, MYSQL_PROTOCOL_TCP, MYSQL_PROTOCOL_SOCKET, + MYSQL_PROTOCOL_PIPE, MYSQL_PROTOCOL_MEMORY }; /* There are three types of queries - the ones that have to go to |