summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.def
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-11-30 22:37:27 +0100
committerunknown <knielsen@knielsen-hq.org>2009-11-30 22:37:27 +0100
commitdb260b19e3edb9e153abf784711a3ae13e40db4a (patch)
tree4a9d9e50072d36ee917a570f8bf83a0117e971db /libmysql/libmysql.def
parent0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff)
parent4a458290441937661136c73afa61393a6634f7b0 (diff)
downloadmariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'libmysql/libmysql.def')
-rw-r--r--libmysql/libmysql.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def
index 45e85b15120..5c05bff8242 100644
--- a/libmysql/libmysql.def
+++ b/libmysql/libmysql.def
@@ -78,6 +78,7 @@ EXPORTS
mysql_next_result
mysql_num_fields
mysql_num_rows
+ mysql_odbc_escape_string
mysql_options
mysql_stmt_param_count
mysql_stmt_param_metadata