diff options
| author | unknown <joreland@mysql.com> | 2005-06-13 14:09:09 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-06-13 14:09:09 +0200 |
| commit | a52035d1dea1592b846cea6b61d179ac2498cc0d (patch) | |
| tree | 7e3f66a702511215287651c2b4df1c301c2f0c8a /libmysqld | |
| parent | a02db7617981d32633812a9279b4092029230cad (diff) | |
| parent | fd34694dc840993537692c10207c8a9d571cf515 (diff) | |
| download | mariadb-git-a52035d1dea1592b846cea6b61d179ac2498cc0d.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/bdb/dist/configure.ac:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/os/os0sync.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/ndb/src/common/logger/Logger.cpp:
Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
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 |