summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <tulin@dl145c.mysql.com>2005-05-18 22:26:23 +0200
committerunknown <tulin@dl145c.mysql.com>2005-05-18 22:26:23 +0200
commit024e1d1bce4a95555b6eff511094258a1f263352 (patch)
treed7d25b0632c9a5473f4af7b1b2c772b0e543f694 /libmysqld
parent2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5 (diff)
parent6f7bccd1aca31045e2678159e2e931d2e94f54dd (diff)
downloadmariadb-git-024e1d1bce4a95555b6eff511094258a1f263352.tar.gz
merge
BitKeeper/etc/logging_ok: auto-union BUILD/compile-alpha-cxx: Auto merged BUILD/compile-alpha-debug: Auto merged configure.in: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/libmysqld.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index 0612141a60d..3c8c46f5305 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -160,3 +160,4 @@ EXPORTS
get_defaults_files
my_charset_bin
my_charset_same
+ modify_defaults_file