summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-03-23 09:42:24 +0100
committerunknown <serg@serg.mylan>2005-03-23 09:42:24 +0100
commit0caa1f597a1afd35e09e9aef718f1e4233a2c1d2 (patch)
treebfec7a86898321f85706b5331aa18fdb1bc68fbb /libmysqld
parent90f3e8aca92c5f86394cee119f28c9557697416b (diff)
parent02089d0c767b8fbf4eeaf19c30601276f3fb7869 (diff)
downloadmariadb-git-0caa1f597a1afd35e09e9aef718f1e4233a2c1d2.tar.gz
merged
BitKeeper/etc/logging_ok: auto-union mysql-test/r/information_schema.result: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/view.result: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/libmysqld.def6
1 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index ea3133594f5..0612141a60d 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -1,6 +1,6 @@
LIBRARY LIBMYSQLD
-DESCRIPTION 'MySQL 4.1 Embedded Server Library'
-VERSION 4.1
+DESCRIPTION 'MySQL 5.0 Embedded Server Library'
+VERSION 5.0
EXPORTS
_dig_vec_upper
_dig_vec_lower
@@ -158,3 +158,5 @@ EXPORTS
mysql_stmt_attr_set
mysql_stmt_field_count
get_defaults_files
+ my_charset_bin
+ my_charset_same