diff options
author | unknown <mwagner@here.mwagner.org> | 2005-01-12 21:09:07 -0600 |
---|---|---|
committer | unknown <mwagner@here.mwagner.org> | 2005-01-12 21:09:07 -0600 |
commit | 46f5c1f1a30e0cd14cb7f3ff21e3e9e3a10ad635 (patch) | |
tree | a00830fb0710f552e101ae3d2f36113106d262b7 | |
parent | bfe5421773b992f313e1d450a6cce291aa482123 (diff) | |
parent | 8191a28b9754eb145cd8c2556ae47a4399a8fe72 (diff) | |
download | mariadb-git-46f5c1f1a30e0cd14cb7f3ff21e3e9e3a10ad635.tar.gz |
Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
-rw-r--r-- | libmysql/libmysql.def | 2 | ||||
-rw-r--r-- | libmysqld/libmysqld.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 6967b09b143..c5579e9ec2b 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -146,4 +146,4 @@ EXPORTS mysql_rpl_query_type mysql_slave_query mysql_embedded - get_defaults_files + get_defaults_files diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 5515f50a1de..ea3133594f5 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -157,4 +157,4 @@ EXPORTS mysql_stmt_attr_get mysql_stmt_attr_set mysql_stmt_field_count - get_defaults_files + get_defaults_files |