Commit 46f5c1f1 authored by unknown's avatar unknown

Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

parents bfe54217 8191a28b
...@@ -146,4 +146,4 @@ EXPORTS ...@@ -146,4 +146,4 @@ EXPORTS
mysql_rpl_query_type mysql_rpl_query_type
mysql_slave_query mysql_slave_query
mysql_embedded mysql_embedded
get_defaults_files get_defaults_files
...@@ -157,4 +157,4 @@ EXPORTS ...@@ -157,4 +157,4 @@ EXPORTS
mysql_stmt_attr_get mysql_stmt_attr_get
mysql_stmt_attr_set mysql_stmt_attr_set
mysql_stmt_field_count mysql_stmt_field_count
get_defaults_files get_defaults_files
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment