diff options
| author | joreland@mysql.com <> | 2005-06-13 14:09:09 +0200 |
|---|---|---|
| committer | joreland@mysql.com <> | 2005-06-13 14:09:09 +0200 |
| commit | 84a04b4a9dadad120d6dbaabd23589a42d76bbd5 (patch) | |
| tree | 7e3f66a702511215287651c2b4df1c301c2f0c8a /libmysqld | |
| parent | 54cff2bc30f755c0bd608591564c65152521e6c9 (diff) | |
| parent | 5e4ce743a351f7d1ee55b534dd689e2d082fa146 (diff) | |
| download | mariadb-git-84a04b4a9dadad120d6dbaabd23589a42d76bbd5.tar.gz | |
merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 1 | ||||
| -rw-r--r-- | libmysqld/libmysqld.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 12bae21a5a0..b4abce128fe 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -96,6 +96,7 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) if DARWIN_MWCC mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` else + -rm -f libmysqld.a if test "$(host_os)" = "netware" ; \ then \ $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \ diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 3c8c46f5305..dcb14e95d36 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -113,6 +113,7 @@ EXPORTS my_charset_latin1 init_alloc_root my_progname + get_charset_name get_charset_by_csname print_defaults find_type |