diff options
| author | Remi Collet <fedora@famillecollet.com> | 2011-01-08 08:30:27 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2011-01-08 08:30:27 +0100 |
| commit | 398e5a245c8c7451bcf7fb0e3d536d134f5929ee (patch) | |
| tree | bc014c40b0d6ec6c508254ab6fdaab07f78264e1 | |
| parent | 8c27fa9ad83b0c6b241a907141fda9457bff50b9 (diff) | |
mysql 5.5 sync with rawhide
| -rw-r--r-- | libmysql.version | 18 | ||||
| -rw-r--r-- | mysql-dev.spec | 11 |
2 files changed, 24 insertions, 5 deletions
diff --git a/libmysql.version b/libmysql.version index dcae997..83ac3c9 100644 --- a/libmysql.version +++ b/libmysql.version @@ -107,6 +107,12 @@ libmysqlclient_16 { mysql_thread_safe; mysql_use_result; mysql_warning_count; +# These are documented in Paul DuBois' MySQL book, so we treat them as part +# of the de-facto API. + free_defaults; + handle_options; + load_defaults; + my_print_help; local: *; }; @@ -119,13 +125,17 @@ libmysqlclient_16.1 { mysql_load_plugin_v; mysql_plugin_options; mysql_stmt_next_result; -# Ideally these wouldn't be exported, but mysql-connector-odbc requires them. -# We limit the damage by prefixing mysql_ (see mysql-dubious-exports.patch), -# which means the symbols are not present in libmysqlclient_16. +# +# Ideally the following symbols wouldn't be exported, but various applications +# require them. We limit the namespace damage by prefixing mysql_ +# (see mysql-dubious-exports.patch), which means the symbols are not present +# in libmysqlclient_16. +# +# mysql-connector-odbc requires these mysql_default_charset_info; mysql_get_charset; mysql_get_charset_by_csname; mysql_net_realloc; -# PHP's mysqli.so requires this (via the ER() macro). +# PHP's mysqli.so requires this (via the ER() macro) mysql_client_errors; }; diff --git a/mysql-dev.spec b/mysql-dev.spec index 9e0d5d4..8d7ea34 100644 --- a/mysql-dev.spec +++ b/mysql-dev.spec @@ -1,6 +1,6 @@ Name: mysql Version: 5.5.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -636,6 +636,15 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Sat Jan 08 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.5.8-3 +- sync with rawhide + +* Mon Jan 3 2011 Tom Lane <tgl@redhat.com> 5.5.8-3 +- my_print_help, load_defaults, free_defaults, and handle_options all turn + out to be documented/recommended in Paul DuBois' MySQL book, so we'd better + consider them part of the de-facto API. +Resolves: #666728 + * Tue Dec 28 2010 Remi Collet <RPMS@FamilleCollet.com> - 5.5.8-2 - sync with rawhide |