diff options
| author | unknown <hf@deer.(none)> | 2003-09-26 15:40:26 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-09-26 15:40:26 +0500 |
| commit | dbb9596727c043805790c9cc24cc8726569d723e (patch) | |
| tree | b80c6147c3a9929ec4e00bac55883c6d575ac2a4 /include | |
| parent | 23dfae40f6b0c0a0d873a248b6a3428b3b6d7cae (diff) | |
| parent | 1705369809aaa17407ce0bd25fdd15607cdf32b0 (diff) | |
| download | mariadb-git-dbb9596727c043805790c9cc24cc8726569d723e.tar.gz | |
Merge
include/mysql.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
libmysqld/lib_sql.cc:
SCCS merged
libmysqld/libmysqld.c:
SCCS merged
sql/sql_parse.cc:
SCCS merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 2e9147894ca..963c35e92ea 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -142,7 +142,7 @@ enum mysql_option MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME, MYSQL_OPT_READ_TIMEOUT, MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT, MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION, - MYSQL_OPT_GUESS_CONNECTION + MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP }; struct st_mysql_options { @@ -180,6 +180,7 @@ struct st_mysql_options { my_bool separate_thread; #endif enum mysql_option methods_to_use; + char *client_ip; }; enum mysql_status |