From: Marcin Krol Date: Sat, 9 Nov 2013 16:24:27 +0000 (+0000) Subject: - PLD merge X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=commitdiff_plain;h=15bd7047e2334586c1ce864337bcba358fe5e7d1 - PLD merge --- diff --git a/libmysql.version b/libmysql.version deleted file mode 100644 index 3b45f43..0000000 --- a/libmysql.version +++ /dev/null @@ -1,152 +0,0 @@ -# symbols exported from mysql 5.1 -libmysqlclient_16 { - global: - _fini; - _init; - my_init; - myodbc_remove_escape; - mysql_affected_rows; - mysql_autocommit; - mysql_change_user; - mysql_character_set_name; - mysql_close; - mysql_commit; - mysql_data_seek; - mysql_debug; - mysql_dump_debug_info; - mysql_embedded; - mysql_eof; - mysql_errno; - mysql_error; - mysql_escape_string; - mysql_fetch_field; - mysql_fetch_field_direct; - mysql_fetch_fields; - mysql_fetch_lengths; - mysql_fetch_row; - mysql_field_count; - mysql_field_seek; - mysql_field_tell; - mysql_free_result; - mysql_get_character_set_info; - mysql_get_client_info; - mysql_get_client_version; - mysql_get_host_info; - mysql_get_parameters; - mysql_get_proto_info; - mysql_get_server_info; - mysql_get_server_version; - mysql_get_ssl_cipher; - mysql_hex_string; - mysql_info; - mysql_init; - mysql_insert_id; - mysql_kill; - mysql_list_dbs; - mysql_list_fields; - mysql_list_processes; - mysql_list_tables; - mysql_more_results; - mysql_next_result; - mysql_num_fields; - mysql_num_rows; - mysql_options; - mysql_ping; - mysql_query; - mysql_read_query_result; - mysql_real_connect; - mysql_real_escape_string; - mysql_real_query; - mysql_refresh; - mysql_rollback; - mysql_row_seek; - mysql_row_tell; - mysql_select_db; - mysql_send_query; - mysql_server_end; - mysql_server_init; - mysql_set_character_set; - mysql_set_local_infile_default; - mysql_set_local_infile_handler; - mysql_set_server_option; - mysql_shutdown; - mysql_sqlstate; - mysql_ssl_set; - mysql_stat; - mysql_stmt_affected_rows; - mysql_stmt_attr_get; - mysql_stmt_attr_set; - mysql_stmt_bind_param; - mysql_stmt_bind_result; - mysql_stmt_close; - mysql_stmt_data_seek; - mysql_stmt_errno; - mysql_stmt_error; - mysql_stmt_execute; - mysql_stmt_fetch; - mysql_stmt_fetch_column; - mysql_stmt_field_count; - mysql_stmt_free_result; - mysql_stmt_init; - mysql_stmt_insert_id; - mysql_stmt_num_rows; - mysql_stmt_param_count; - mysql_stmt_param_metadata; - mysql_stmt_prepare; - mysql_stmt_reset; - mysql_stmt_result_metadata; - mysql_stmt_row_seek; - mysql_stmt_row_tell; - mysql_stmt_send_long_data; - mysql_stmt_sqlstate; - mysql_stmt_store_result; - mysql_store_result; - mysql_thread_end; - mysql_thread_id; - mysql_thread_init; - 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; - client_errors; -# This isn't really documented anywhere, but it seems to be part of the -# de-facto API as well. We're not going to export the deprecated version -# make_scrambled_password, however. - my_make_scrambled_password; - local: - *; -}; -# symbols added in mysql 5.5 -libmysqlclient_18 { - global: - mysql_client_find_plugin; - mysql_client_register_plugin; - mysql_load_plugin; - mysql_load_plugin_v; - mysql_plugin_options; - mysql_stmt_next_result; -# -# 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) - mysql_client_errors; -# perl-DBD-mysql-4.018 for is_prefix - mysql_is_prefix; -# hiphop-php: TODO: added mysql_ prefix - cli_safe_read; - net_field_length; - free_root; -}; diff --git a/mysql-versioning.patch b/mysql-versioning.patch new file mode 100644 index 0000000..1a975ed --- /dev/null +++ b/mysql-versioning.patch @@ -0,0 +1,10 @@ +--- Percona-Server-5.6.14-rel62.0//libmysql/libmysql.map~ 2013-10-22 09:42:41.000000000 +0200 ++++ Percona-Server-5.6.14-rel62.0//libmysql/libmysql.map 2013-10-30 17:14:14.270019272 +0100 +@@ -145,6 +145,7 @@ + mysql_net_realloc; + # PHP's mysqli.so requires this (via the ER() macro) + mysql_client_errors; ++ client_errors; + # mydumper requires this (added by remi) + my_net_read; + }; diff --git a/mysql.spec b/mysql.spec index f3039b9..d1a3132 100644 --- a/mysql.spec +++ b/mysql.spec @@ -23,7 +23,7 @@ %bcond_with tests # FIXME: don't run correctly %bcond_with ndb # NDB is now a separate product, this here is broken, so disable it -%define percona_rel 61.0 +%define percona_rel 62.0 %include /usr/lib/rpm/macros.perl Summary: MySQL: a very fast and reliable SQL database engine Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank @@ -34,14 +34,12 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql -Version: 5.6.13 +Version: 5.6.14 Release: 1 License: GPL + MySQL FLOSS Exception Group: Applications/Databases -# Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads -# Source0: http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz -Source0: http://www.percona.com/redir/downloads/Percona-Server-5.6/LATEST/source/Percona-Server-%{version}-rel%{percona_rel}.tar.gz -# Source0-md5: 25a6d313e98ce3f759aa08288941e748 +Source0: http://www.percona.com/redir/downloads/Percona-Server-5.6/LATEST/release-%{version}-%{percona_rel}/483/source/Percona-Server-%{version}-rel%{percona_rel}.tar.gz +# Source0-md5: 2e6b2ce44173784bb8990813e536cf3c Source100: http://www.sphinxsearch.com/files/sphinx-2.1.2-release.tar.gz # Source100-md5: 3e828fa58e2e6049f02aa6aef3009d48 Source1: %{name}.init @@ -57,9 +55,7 @@ Source11: %{name}-ndb-cpc.init Source12: %{name}-ndb-cpc.sysconfig Source13: %{name}-client.conf Source14: my.cnf -# from fedora -Source15: lib%{name}.version - +Patch1: %{name}-versioning.patch Patch2: %{name}hotcopy-5.0-5.5.patch Patch3: bug-67402.patch # from fedora @@ -488,7 +484,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC. mv sphinx-*/mysqlse storage/sphinx %patch18 -p1 %endif - +%patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -507,8 +503,8 @@ mv sphinx-*/mysqlse storage/sphinx [ -f sql/sql_yacc.cc ] && rm sql/sql_yacc.cc [ -f sql/sql_yacc.h ] && rm sql/sql_yacc.h -# upstream has fallen down badly on symbol versioning, do it ourselves -install %{SOURCE15} libmysql/libmysql.ver.in +# map has more sane versioning that default "global everything" in ver.in +cp -p libmysql/libmysql.map libmysql/libmysql.ver.in %build install -d build @@ -593,10 +589,6 @@ install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql-ndb-cpc cp -a %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-cpc %endif -# symlinks point to the .so file, fix it -ln -sf libmysqlclient.so.18 $RPM_BUILD_ROOT%{_libdir}/libmysqlclient_r.so.18 -ln -sf libmysqlclient.so.18.0.0 $RPM_BUILD_ROOT%{_libdir}/libmysqlclient_r.so.18.0.0 - sed -i -e 's,/usr//usr,%{_prefix},g' $RPM_BUILD_ROOT%{_bindir}/mysql_config sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config