summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-05-26 21:40:27 +0500
committerunknown <hf@deer.(none)>2004-05-26 21:40:27 +0500
commit00c41b28504728ecdce90a3a2975102e401a3bfc (patch)
treeda6efb78f98da49c9e60050f45067be7a2860d8a /libmysql
parent3b1dd9af7b1ba6645bf8c5594ee456ca62d0f4c0 (diff)
downloadmariadb-git-00c41b28504728ecdce90a3a2975102e401a3bfc.tar.gz
Fix to make Windows compilation smoother
VC++Files/innobase/innobase.dsp: non-existent file removed client/mysql.cc: local opt_max_allowed_packet and opt_net_buffer_length introduced client/mysqldump.c: local opt_max_allowed_packet and opt_net_buffer_length introduced include/mysql.h: mysql_get_parameters() interface added #define max_allowed_packet added include/mysql_com.h: these should not be exported libmysql/libmysql.c: mysql_get_parameters implementations libmysql/libmysql.def: interface changed libmysql_r/Makefile.am: MYSQL_CLIENT define added libmysqld/lib_sql.cc: line moved to be above the '#include "mysql.cc"' libmysqld/libmysqld.c: mysql_get_parameters implementation (embedded) libmysqld/libmysqld.def: interface changed sql/log_event.cc: should be like that in this case tools/mysqlmanager.c: compiler warns on this line
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c8
-rw-r--r--libmysql/libmysql.def19
2 files changed, 9 insertions, 18 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index dba9c83b339..0a23954ae67 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -121,6 +121,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 721097905a8..b0433a34cb3 100644
--- a/libmysql/libmysql.def
+++ b/libmysql/libmysql.def
@@ -59,7 +59,6 @@ EXPORTS
is_prefix
list_add
list_delete
- max_allowed_packet
my_casecmp
my_init
my_end
@@ -70,7 +69,6 @@ EXPORTS
my_realloc
mysql_thread_end
mysql_thread_init
- net_buffer_length
set_dynamic
strcend
strdup_root
@@ -111,19 +109,4 @@ EXPORTS
load_defaults
free_defaults
my_path
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ mysql_get_parameters