From: Marcin Krol Date: Mon, 21 Oct 2013 10:26:43 +0000 (+0000) Subject: - PLD merge X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=21ede5dc6b551cc80ae65451ce265cc7fe7ec764;p=packages%2Fmysql.git - PLD merge --- diff --git a/bug-66589.patch b/bug-66589.patch new file mode 100644 index 0000000..fbf75e6 --- /dev/null +++ b/bug-66589.patch @@ -0,0 +1,10 @@ +--- Percona-Server-5.5.33-rel31.1/scripts/mysqlhotcopy.sh~ 2013-10-02 20:29:57.000000000 +0300 ++++ Percona-Server-5.5.33-rel31.1/scripts/mysqlhotcopy.sh 2013-10-02 20:30:33.825747635 +0300 +@@ -268,6 +268,7 @@ + $sth_dbs->execute; + while ( my ($db_name) = $sth_dbs->fetchrow_array ) { + next if $db_name =~ m/^information_schema$/i; ++ next if $db_name =~ m/^performance_schema$/i; + push @db_desc, { 'src' => $db_name, 't_regex' => $t_regex } if ( $db_name =~ m/$opt{regexp}/o ); + } + } diff --git a/mysql.init b/mysql.init index ab32354..b4dd314 100755 --- a/mysql.init +++ b/mysql.init @@ -455,7 +455,7 @@ mysqlinit() { nls "Seems that database is initialized now. Remove by hand %s" "$MYSQL_DATA_DIR/mysql" nls "before initializing database." nls "For now skipping cluster %s." "$clusterdir" - return + exit 6 fi show "Installing MySQL system tables for $MYSQL_DATA_DIR" diff --git a/mysql.spec b/mysql.spec index 109ac89..f3039b9 100644 --- a/mysql.spec +++ b/mysql.spec @@ -35,7 +35,7 @@ Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql Version: 5.6.13 -Release: 0.1 +Release: 1 License: GPL + MySQL FLOSS Exception Group: Applications/Databases # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads @@ -59,6 +59,7 @@ Source13: %{name}-client.conf Source14: my.cnf # from fedora Source15: lib%{name}.version + Patch2: %{name}hotcopy-5.0-5.5.patch Patch3: bug-67402.patch # from fedora @@ -73,6 +74,7 @@ Patch19: %{name}-chain-certs.patch # from fedora Patch20: %{name}-dubious-exports.patch Patch21: bison3.patch +Patch22: bug-66589.patch URL: http://www.mysql.com/products/community/ BuildRequires: bison >= 1.875 BuildRequires: cmake >= 2.6 @@ -486,6 +488,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC. mv sphinx-*/mysqlse storage/sphinx %patch18 -p1 %endif + %patch2 -p1 %patch3 -p1 @@ -498,11 +501,15 @@ mv sphinx-*/mysqlse storage/sphinx %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 # to get these files rebuild [ -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 + %build install -d build cd build @@ -510,17 +517,13 @@ cd build # (it defaults to first cluster but user may change it to whatever # cluster it wants) -# upstream has fallen down badly on symbol versioning, do it ourselves -install -d libmysql -cp -a %{SOURCE15} libmysql/libmysql.version - %cmake \ -DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \ -DCMAKE_C_FLAGS_RELEASE="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ -DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ -DCOMPILATION_COMMENT="TLD Linux MySQL RPM" \ -DCURSES_INCLUDE_PATH=/usr/include/ncurses \ - %{!?with_systemtap:-DENABLE_DTRACE=ON} \ + %{?with_systemtap:-DENABLE_DTRACE=ON} \ -DFEATURE_SET="community" \ -DINSTALL_LAYOUT=RPM \ -DINSTALL_LIBDIR=%{_lib} \ @@ -650,6 +653,8 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql-stress-test.pl.1* %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql-test-run.pl.1* %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mysql-test +# libmysqld examples +%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql{_client_test_embedded,_embedded,test_embedded} # not needed %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/libdaemon_example.* @@ -854,7 +859,7 @@ done %files %defattr(644,root,root,755) -%doc build/support-files/*.cnf build/support-files/*.ini +%doc build/support-files/*.cnf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} @@ -878,15 +883,16 @@ done %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_socket.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so %attr(755,root,root) %{_libdir}/%{name}/plugin/dialog.so -%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so -%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so -%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so +#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so +#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so +#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so %attr(755,root,root) %{_libdir}/%{name}/plugin/mypluglib.so %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_client.so %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_interface.so %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_server.so %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_master.so %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_slave.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/validate_password.so %if %{with sphinx} %attr(755,root,root) %{_libdir}/%{name}/plugin/ha_sphinx.so %endif @@ -918,13 +924,17 @@ done # This is template for configuration file which is created after 'service mysql init' %{_datadir}/%{name}/mysqld.conf -%{_datadir}/%{name}/mysql_system_tables.sql +%{_datadir}/%{name}/mysql_security_commands.sql %{_datadir}/%{name}/mysql_system_tables_data.sql +%{_datadir}/%{name}/mysql_system_tables.sql %{_datadir}/%{name}/mysql_test_data_timezone.sql %{_datadir}/%{name}/english +%{_datadir}/%{name}/dictionary.txt %{_datadir}/%{name}/fill_help_tables.sql +%{_datadir}/%{name}/innodb_memcached_config.sql #%{_datadir}/%{name}/mysql_fix_privilege_tables.sql +%lang(bg) %{_datadir}/%{name}/bulgarian %lang(cs) %{_datadir}/%{name}/czech %lang(da) %{_datadir}/%{name}/danish %lang(de) %{_datadir}/%{name}/german @@ -1002,6 +1012,7 @@ done %attr(755,root,root) %{_bindir}/mysqladmin %attr(755,root,root) %{_bindir}/mysqlbinlog %attr(755,root,root) %{_bindir}/mysqlbug +%attr(755,root,root) %{_bindir}/mysql_config_editor %attr(755,root,root) %{_bindir}/mysqldump %attr(755,root,root) %{_bindir}/mysqlimport %attr(755,root,root) %{_bindir}/mysqlshow @@ -1009,6 +1020,7 @@ done %{_mandir}/man1/mysqladmin.1* %{_mandir}/man1/mysqlbinlog.1* %{_mandir}/man1/mysqlbug.1* +%{_mandir}/man1/mysql_config_editor.1* %{_mandir}/man1/mysqldump.1* %{_mandir}/man1/mysqlimport.1* %{_mandir}/man1/mysqlshow.1* @@ -1035,6 +1047,8 @@ done %if %{with ndb} %attr(755,root,root) %{_libdir}/libndbclient.so %endif +# static-only so far +%{_libdir}/libmysqld.a %{_includedir}/mysql %{_aclocaldir}/mysql.m4 %{_mandir}/man1/mysql_config.1*