summaryrefslogtreecommitdiff
path: root/libmysqld/libmysqld.def
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-27 00:30:28 +0300
committerunknown <monty@mysql.com>2004-05-27 00:30:28 +0300
commit7c5cd4125dfe7b6891aeffc567387573695714c3 (patch)
tree5ed4e118d371f2a1d84eaaef85c5869d24977363 /libmysqld/libmysqld.def
parent5fe72df8fd23a5b5f6938a9e559e916594b78449 (diff)
parentcc24ac7079827af1290a87ca0d5ce817329a9f6b (diff)
downloadmariadb-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 'libmysqld/libmysqld.def')
-rw-r--r--libmysqld/libmysqld.def3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index 8b2ad8379d6..7c93951df7a 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -92,7 +92,6 @@ EXPORTS
mysql_thread_safe
mysql_use_result
mysql_warning_count
- net_buffer_length
set_dynamic
strcend
strcont
@@ -128,5 +127,5 @@ EXPORTS
alloc_root
free_root
my_read
- max_allowed_packet
llstr
+ mysql_get_parameters