diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-05-18 22:26:23 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-05-18 22:26:23 +0200 |
| commit | 024e1d1bce4a95555b6eff511094258a1f263352 (patch) | |
| tree | d7d25b0632c9a5473f4af7b1b2c772b0e543f694 /libmysql | |
| parent | 2fe8cc51aad5fb7958a90ea8be3667f1e23b0ea5 (diff) | |
| parent | 6f7bccd1aca31045e2678159e2e931d2e94f54dd (diff) | |
| download | mariadb-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 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 3 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index bcd2ec6c057..a2bfa616f6b 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -61,7 +61,8 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \ my_symlink.lo my_fstream.lo \ mf_loadpath.lo my_pthread.lo my_thr_init.lo \ - thr_mutex.lo mulalloc.lo string.lo default.lo \ + thr_mutex.lo mulalloc.lo string.lo \ + default.lo default_modify.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ charset.lo charset-def.lo hash.lo mf_iocache.lo \ mf_iocache2.lo my_seek.lo my_sleep.lo \ diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index a597ee37682..2da88c271ba 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -1,5 +1,5 @@ LIBRARY LIBMYSQL -DESCRIPTION 'MySQL 4.1 Client Library' +DESCRIPTION 'MySQL 5.0 Client Library' VERSION 6.0 EXPORTS _dig_vec_lower @@ -150,6 +150,4 @@ EXPORTS mysql_server_end mysql_set_character_set get_defaults_files - get_charset_by_csname - get_charsets_dir - charsets_dir + modify_defaults_file |