diff options
| author | unknown <bar@mysql.com> | 2005-07-26 13:25:18 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-07-26 13:25:18 +0500 |
| commit | 5fa6e3c557ffb49b7382bb437b47919b5862488a (patch) | |
| tree | c659c5adcd34cb4e261a4f8d43d58c826560da26 /libmysql | |
| parent | 4cc9707e6c40b303a8551887fbe2926d6b355db5 (diff) | |
| parent | d66d45ef8e253b69daf006b0162a719bd8a7bf1a (diff) | |
| download | mariadb-git-5fa6e3c557ffb49b7382bb437b47919b5862488a.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
include/config-netware.h:
auto merge fix
libmysql/libmysql.def:
after merge fix
sql/item_func.cc:
SCCS merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index a469c67c466..5d8c2309063 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -148,6 +148,7 @@ EXPORTS mysql_embedded mysql_server_init mysql_server_end + get_defaults_files mysql_set_character_set mysql_get_character_set_info get_defaults_options |