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

Merging

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2002-12-17 19:57:23 +04:00
parent 44d684d13f fddbc989a4
commit d0598c88d0
7 changed files with 258 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysql.h
View File

@ -122,7 +122,8 @@ typedef struct st_mysql_data {
struct st_mysql_options {
unsigned int connect_timeout,client_flag;
unsigned int port;
char *host,*init_command,*user,*password,*unix_socket,*db;
char *host,*user,*password,*unix_socket,*db;
struct st_dynamic_array *init_commands;
char *my_cnf_file,*my_cnf_group, *charset_dir, *charset_name;
char *ssl_key; /* PEM key file */
char *ssl_cert; /* PEM cert file */