diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-08-15 21:30:45 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-08-15 21:30:45 +0200 |
| commit | c44ead52b4e1c3447a70b869fdd5da9d1b103b7e (patch) | |
| tree | 66e558582d5effa8f056eaca63a42d31e66d6897 /libmysqld/libmysqld.def | |
| parent | a87a8764c3fee484cc6866dc215e35eb3fdd2c26 (diff) | |
| parent | 9d819b7d7f748b41e137b1eb94495156041a2593 (diff) | |
| download | mariadb-git-c44ead52b4e1c3447a70b869fdd5da9d1b103b7e.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/field.h:
Manual merge
Diffstat (limited to 'libmysqld/libmysqld.def')
| -rw-r--r-- | libmysqld/libmysqld.def | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index c1025cd3846..78ff08e510a 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -1,6 +1,6 @@ LIBRARY LIBMYSQLD -DESCRIPTION 'MySQL 5.0 Embedded Server Library' -VERSION 5.0 +DESCRIPTION 'MySQL 5.1 Embedded Server Library' +VERSION 5.1 EXPORTS _dig_vec_upper _dig_vec_lower @@ -48,6 +48,7 @@ EXPORTS mysql_errno mysql_error mysql_escape_string + mysql_hex_string mysql_fetch_field mysql_fetch_field_direct mysql_fetch_fields @@ -62,11 +63,13 @@ EXPORTS mysql_get_host_info mysql_get_proto_info mysql_get_server_info + mysql_get_client_version mysql_get_ssl_cipher mysql_info mysql_init mysql_insert_id mysql_kill + mysql_set_server_option mysql_list_dbs mysql_list_fields mysql_list_processes @@ -172,4 +175,3 @@ EXPORTS my_charset_bin my_charset_same modify_defaults_file - mysql_set_server_option |