diff options
| author | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
| commit | 7c5cd4125dfe7b6891aeffc567387573695714c3 (patch) | |
| tree | 5ed4e118d371f2a1d84eaaef85c5869d24977363 /libmysql | |
| parent | 5fe72df8fd23a5b5f6938a9e559e916594b78449 (diff) | |
| parent | cc24ac7079827af1290a87ca0d5ce817329a9f6b (diff) | |
| download | mariadb-git-7c5cd4125dfe7b6891aeffc567387573695714c3.tar.gz | |
merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/que/que0que.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 8 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 7a376cad736..49b076d1b98 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -183,6 +183,14 @@ void STDCALL mysql_server_end() mysql_client_init= org_my_init_done= 0; } +static MYSQL_PARAMETERS mysql_internal_parameters= +{&max_allowed_packet, &net_buffer_length}; + +MYSQL_PARAMETERS *STDCALL mysql_get_parameters() +{ + return &mysql_internal_parameters; +} + my_bool STDCALL mysql_thread_init() { #ifdef THREAD diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 91691a2986a..97eefc103d3 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -16,7 +16,6 @@ EXPORTS list_add list_delete load_defaults - max_allowed_packet my_end my_getopt_print_errors my_init @@ -24,6 +23,7 @@ EXPORTS my_memdup my_no_flags_free my_path + mysql_get_parameters my_print_help my_print_variables my_realloc @@ -116,7 +116,6 @@ EXPORTS mysql_stmt_sqlstate mysql_sqlstate mysql_get_server_version - net_buffer_length set_dynamic strcend strcont |