diff options
author | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
commit | b3cb7b7f7742f691c9a14598e455b4ecb96f07e1 (patch) | |
tree | fd68b42f3c1b7e47b36b19209daf540c3a0c7a68 /libmysql/libmysql.def | |
parent | 6f38e3083f0d867af8d1499fba92c7eaae295726 (diff) | |
parent | aee5ef8516ce0599402ca8e8a6b72f3eca36739b (diff) | |
download | mariadb-git-b3cb7b7f7742f691c9a14598e455b4ecb96f07e1.tar.gz |
merge with 4.0.5
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'libmysql/libmysql.def')
-rw-r--r-- | libmysql/libmysql.def | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index bf22b95fc8c..a7fb4d378e5 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -1,6 +1,6 @@ LIBRARY LIBMYSQL -DESCRIPTION 'MySQL 4.0 Client Library' -VERSION 5.0 +DESCRIPTION 'MySQL 4.1 Client Library' +VERSION 6.0 EXPORTS mysql_affected_rows mysql_close @@ -59,7 +59,6 @@ EXPORTS list_add list_delete max_allowed_packet - my_casecmp my_init my_end my_strdup @@ -101,8 +100,8 @@ EXPORTS mysql_rpl_probe mysql_set_master mysql_add_slave - - + mysql_warning_count + mysql_warnings |