X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mysql.spec;h=b019d48ab185ffe84d45c10ebd25741cce48465f;hb=2adeda8566caa2c352e06466127cfa2d0a64d371;hp=0eb9b32796a3f56c76092aa4c00a07f3d42b3b5d;hpb=11822e221c03afb360db1585ec7b558f68f39495;p=packages%2Fmysql.git diff --git a/mysql.spec b/mysql.spec index 0eb9b32..b019d48 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,7 +1,5 @@ # TODO: # - mysqldump ... (invalid usage) prints to stdout not stderr (idiotic if you want to create dump and get usage in .sql) -# - unpackaged: -# /usr/bin/mysqlaccess.conf # - http://bugs.mysql.com/bug.php?id=16470 # - innodb are dynamic (= as plugins) ? # - missing have_archive, have_merge @@ -19,11 +17,14 @@ %bcond_without federated # Federated storage engine support %bcond_without raid # RAID support %bcond_without ssl # OpenSSL support +%bcond_without systemtap # systemtap/dtrace probes %bcond_without tcpd # libwrap (tcp_wrappers) support -%bcond_with sphinx # Sphinx storage engine support +%bcond_without sphinx # Sphinx storage engine support %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 rel 2 +%define percona_rel 73.1 %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,15 +35,16 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql -Version: 5.5.11 -Release: 1 +Version: 5.6.25 +Release: %{percona_rel}.%{rel} 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-md5: befa4e0d0aa95be6c8f6f143ae3b0641 -Source100: http://www.sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz -# Source100-md5: 7b9b618cb9b378f949bb1b91ddcc4f54 +# Source0: http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz +Source0: http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz +# Source0-md5: 3a60a01f046139e1b2f680d2df4917a6 +Source100: http://www.sphinxsearch.com/files/sphinx-2.2.9-release.tar.gz +# Source100-md5: 1fcc3d180c0559bdeb93602ef248caf4 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -56,18 +58,16 @@ Source11: %{name}-ndb-cpc.init Source12: %{name}-ndb-cpc.sysconfig Source13: %{name}-client.conf Source14: my.cnf +Patch0: %{name}-opt.patch +Patch1: %{name}-versioning.patch +Patch2: %{name}hotcopy-5.0-5.5.patch +Patch3: bug-67402.patch +Patch4: %{name}-no-default-secure-auth.patch +Patch5: %{name}-system-libhsclient.patch # from fedora -Source15: lib%{name}.version -Patch2: %{name}-c++.patch -Patch3: %{name}-info.patch -Patch4: %{name}-sql-cxx-pic.patch -# from fedora -Patch5: %{name}-versioning.patch Patch6: %{name}-system-users.patch -Patch7: %{name}-bug-34192.patch -Patch8: %{name}-client-config.patch + Patch9: %{name}-build.patch -Patch10: %{name}-alpha.patch Patch11: %{name}-upgrade.patch Patch12: %{name}-config.patch Patch14: %{name}-bug-43594.patch @@ -75,75 +75,35 @@ Patch18: %{name}-sphinx.patch Patch19: %{name}-chain-certs.patch # from fedora Patch20: %{name}-dubious-exports.patch -# -Patch100: microsec_process.patch -Patch101: optimizer_fix.patch -Patch102: mysql_dump_ignore_ct.patch -Patch103: control_online_alter_index.patch -Patch104: show_temp.patch -Patch105: innodb_show_status.patch -Patch106: innodb_io_patches.patch -Patch107: innodb_opt_lru_count.patch -Patch108: innodb_extra_rseg.patch -Patch109: innodb_overwrite_relay_log_info.patch -Patch110: innodb_thread_concurrency_timer_based.patch -Patch111: innodb_dict_size_limit.patch -Patch112: innodb_split_buf_pool_mutex.patch -Patch113: innodb_expand_import.patch -Patch114: innodb_show_sys_tables.patch -Patch115: innodb_stats.patch -Patch116: innodb_recovery_patches.patch -Patch117: innodb_admin_command_base.patch -Patch118: innodb_show_lock_name.patch -Patch119: innodb_extend_slow.patch -Patch120: innodb_lru_dump_restore.patch -Patch121: innodb_separate_doublewrite.patch -Patch122: innodb_pass_corrupt_table.patch -Patch123: innodb_fast_checksum.patch -Patch124: innodb_files_extend.patch -Patch125: innodb_fix_misc.patch -Patch126: innodb_deadlock_count.patch -Patch127: innodb_adaptive_hash_index_partitions.patch -Patch128: innodb_buffer_pool_pages_i_s.patch -Patch129: innodb_buffer_pool_shm.patch -Patch130: innodb_show_status_extend.patch -Patch131: slow_extended.patch -Patch132: percona_support.patch -Patch133: query_cache_enhance.patch -Patch134: log_connection_error.patch -Patch135: mysql_syslog.patch -Patch136: response_time_distribution.patch -Patch137: error_pad.patch -Patch138: remove_fcntl_excessive_calls.patch -Patch139: sql_no_fcache.patch -Patch140: show_slave_status_nolock.patch -Patch141: log_warnings_suppress.patch -Patch142: userstat.patch -Patch143: bug580324.patch -Patch144: mysql_remove_eol_carret.patch -Patch145: processlist_row_stats.patch -Patch146: innodb_expand_fast_index_creation.patch -Patch147: innodb_bug60788.patch -# + +Patch22: bug-66589.patch +Patch23: bug-44278.patch +Patch24: %{name}-cmake.patch + +Patch26: mysqldumpslow-clusters.patch +Patch27: x32.patch URL: http://www.mysql.com/products/community/ -BuildRequires: bison +BuildRequires: bison >= 1.875 BuildRequires: cmake >= 2.6 -BuildRequires: groff +BuildRequires: readline-devel >= 6.2 %if "%{pld_release}" == "ac" BuildRequires: libstdc++4-devel >= 5:4.0 %else BuildRequires: libstdc++-devel >= 5:4.0 %endif -BuildRequires: libtool +BuildRequires: automake +BuildRequires: libhsclient-devel %{?with_tcpd:BuildRequires: libwrap-devel} BuildRequires: ncurses-devel >= 4.2 %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} +BuildRequires: pam-devel %{?with_autodeps:BuildRequires: perl-DBI} BuildRequires: perl-devel >= 1:5.6.1 -BuildRequires: readline-devel >= 4.2 +BuildRequires: python-modules BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.597 BuildRequires: sed >= 4.0 +%{?with_systemtap:BuildRequires: systemtap-sdt-devel} BuildRequires: zlib-devel Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -166,15 +126,14 @@ Provides: msqlormysql Provides: user(mysql) Obsoletes: MySQL Obsoletes: mysql-server -Conflicts: logrotate < 3.7-4 +Conflicts: logrotate < 3.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _orgname percona-server %define _libexecdir %{_sbindir} %define _localstatedir /var/lib/mysql %define _mysqlhome /home/services/mysql -%define _noautoreqdep 'perl(DBD::mysql)' - %description MySQL is a true multi-user, multi-threaded SQL (Structured Query Language) database server. SQL is the most popular database language @@ -354,6 +313,7 @@ Summary(uk.UTF-8): MySQL клієнт Group: Applications/Databases Requires: %{name}-charsets = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} +Requires: readline >= 6.2 Obsoletes: MySQL-client %description client @@ -399,6 +359,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: zlib-devel Obsoletes: MySQL-devel Obsoletes: libmysql10-devel +Obsoletes: webscalesql-devel %description devel This package contains the development header files and other files @@ -537,86 +498,46 @@ This package contains the standard MySQL NDB CPC Daemon. Ten pakiet zawiera standardowego demona MySQL NDB CPC. %prep -%setup -q %{?with_sphinx:-a100} +%setup -q -n percona-server-%{version}-%{percona_rel} %{?with_sphinx:-a100} + +# we want to use old, mysql compatible client library name +find . -name CMakeLists.txt -exec sed -i -e 's#perconaserverclient#mysqlclient#g' "{}" ";" +sed -i -e 's#perconaserverclient#mysqlclient#g' libmysql/libmysql.{ver.in,map} scripts/mysql_config.* + +%patch0 -p1 + %if %{with sphinx} # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51 mv sphinx-*/mysqlse storage/sphinx %patch18 -p1 %endif -#%patch2 -p1 # NEEDS CHECK, which exact program needs -lc++ +%patch1 -p1 +%patch2 -p1 %patch3 -p1 -%ifarch alpha -# this is strange: mysqld functions for UDF modules are not explicitly defined, -# so -rdynamic is used; in such case gcc3+ld on alpha doesn't like C++ vtables -# in objects compiled without -fPIC %patch4 -p1 -# gcc 3.3.x ICE -%patch10 -p1 -%endif %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 + %patch9 -p1 %patch11 -p1 %patch12 -p1 %patch14 -p0 %patch19 -p1 %patch20 -p1 -# -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 -%patch114 -p1 -%patch115 -p1 -%patch116 -p1 -%patch117 -p1 -%patch118 -p1 -%patch119 -p1 -%patch120 -p1 -%patch121 -p1 -%patch122 -p1 -%patch123 -p1 -%patch124 -p1 -%patch125 -p1 -%patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 -%patch131 -p1 -%patch132 -p1 -%patch133 -p1 -%patch134 -p1 -%patch135 -p1 -%patch136 -p1 -%patch137 -p1 -%patch138 -p1 -%patch139 -p1 -%patch140 -p1 -%patch141 -p1 -%patch142 -p1 -%patch143 -p1 -%patch144 -p1 -%patch145 -p1 -%patch146 -p1 -%patch147 -p1 -# + +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 + +%patch26 -p1 +%patch27 -p1 # to get these files rebuild -rm sql/sql_yacc.cc -rm sql/sql_yacc.h +[ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc +[ -f sql/sql_yacc.h ] && %{__rm} sql/sql_yacc.h + +# 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 @@ -632,37 +553,38 @@ cd build %{expand:%%define __cpp %(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')} %endif -# upstream has fallen down badly on symbol versioning, do it ourselves -install -d libmysql -cp -a %{SOURCE15} libmysql/libmysql.version - -%cmake \ +CPPFLAGS="%{rpmcppflags}" \ +%cmake .. \ -DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ + -DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \ + -DCURSES_INCLUDE_PATH=/usr/include/ncurses \ + %{?with_systemtap:-DENABLE_DTRACE=ON} \ -DFEATURE_SET="community" \ - -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" \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DINSTALL_LAYOUT=RPM \ + -DINSTALL_LIBDIR=%{_lib} \ + -DINSTALL_MYSQLTESTDIR_RPM="" \ + -DINSTALL_PLUGINDIR=%{_lib}/%{name}/plugin \ + -DINSTALL_SQLBENCHDIR=%{_datadir} \ + -DINSTALL_SUPPORTFILESDIR=share/%{_orgname}-support \ + -DINSTALL_MYSQLSHAREDIR=share/%{_orgname} \ + -DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \ %{?debug:-DWITH_DEBUG=ON} \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITH_FAST_MUTEXES=ON \ + -DWITH_LIBWRAP=%{?with_tcpd:ON}%{!?with_tcpd:OFF} \ + -DWITH_PAM=ON \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ -DWITH_PIC=ON \ - -DWITH_LIBEDIT=OFF \ - -DWITH_READLINE=OFF \ %if "%{pld_release}" == "ac" -DWITH_SSL=%{?with_ssl:bundled}%{!?with_ssl:no} \ %else -DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \ %endif - -DWITH_ZLIB=system \ - -DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \ - -DWITH_LIBWRAP=%{?with_tcpd:ON}%{!?with_tcpd:OFF} \ -DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \ - -DCURSES_INCLUDE_PATH=/usr/include/ncurses \ - -DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \ - -DINSTALL_LAYOUT=RPM \ - -DINSTALL_MYSQLTESTDIR_RPM="" \ - -DINSTALL_SQLBENCHDIR=%{_datadir} \ - -DINSTALL_SUPPORTFILESDIR=%{_datadir}/%{name}-support \ - .. + -DWITH_ZLIB=system \ + -DWITH_READLINE=system %{__make} @@ -672,13 +594,12 @@ cp -a %{SOURCE15} libmysql/libmysql.version rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql,skel} \ $RPM_BUILD_ROOT/var/{log/{archive,}/mysql,lib/mysql} \ - $RPM_BUILD_ROOT{%{_infodir},%{_mysqlhome}} + $RPM_BUILD_ROOT%{_mysqlhome} \ + $RPM_BUILD_ROOT%{_libdir} %{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT -cp -a Docs/mysql.info $RPM_BUILD_ROOT%{_infodir} - install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/mysql cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mysql @@ -697,8 +618,9 @@ touch $RPM_BUILD_ROOT/var/log/%{name}/{mysqld,query,slow}.log cp mysqld.conf mysqld.tmp awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf -cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.conf +cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.conf cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/mysql-client.conf +ln -s mysql-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/my.cnf cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/skel/.my.cnf # NDB @@ -711,29 +633,30 @@ 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 # remove known unpackaged files -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mysql-support +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{_orgname}-support # rename not to be so generic name mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump mv $RPM_BUILD_ROOT%{_mandir}/man1/{,mysql_}resolve_stack_dump.1 +# move to _sysconfdir +mv $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}/mysqlaccess.conf + # not useful without -debug build %{!?debug:%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_resolve_stack_dump} %{!?debug:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_resolve_stack_dump.1} # generate symbols file, so one can generate backtrace using it -# mysql_resolve_stack_dump -s %{_datadir}/%{name}/mysqld.sym -n mysqld.stack. +# mysql_resolve_stack_dump -s %{_datadir}/%{_orgname}/mysqld.sym -n mysqld.stack. # http://dev.mysql.com/doc/refman/5.0/en/using-stack-trace.html -%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.sym} +%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.sym} # do not clobber users $PATH +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_plugin mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_upgrade mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/innochecksum mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamchk @@ -749,10 +672,10 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_safe %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_multi %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}* -#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate -#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server -#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure -%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg-utf8.txt +#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysql-log-rotate +#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysql.server +#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/binary-configure +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/errmsg-utf8.txt %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1* %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server* @@ -766,9 +689,15 @@ 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.* +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/daemon_example.ini + +# not an .info file +%{__rm} $RPM_BUILD_ROOT%{_infodir}/mysql.info %clean rm -rf $RPM_BUILD_ROOT @@ -778,7 +707,6 @@ rm -rf $RPM_BUILD_ROOT %useradd -u 89 -d %{_mysqlhome} -s /bin/sh -g mysql -c "MySQL Server" mysql %post -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 /sbin/ldconfig /sbin/chkconfig --add mysql %service mysql restart @@ -790,9 +718,7 @@ if [ "$1" = "0" ]; then fi %postun -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 /sbin/ldconfig - if [ "$1" = "0" ]; then %userremove mysql %groupremove mysql @@ -881,7 +807,7 @@ done %banner -e %{name}-4.1.x <<-EOF If you want to use new help tables in MySQL 4.1.x then You'll need to import the help data: - mysql -u mysql mysql < %{_datadir}/%{name}/fill_help_tables.sql + mysql -u mysql mysql < %{_datadir}/%{_orgname}/fill_help_tables.sql EOF #' @@ -957,49 +883,63 @@ for config in $configs; do s/set-variable\s*=\s* // s/^skip-locking/skip-external-locking/ # this is not valid for server. it is client option - s/default-character-set/# client-config: &/ + s/^default-character-set/# client-config: &/ # use # as comment in config s/^;/#/ ' $config - datadir=$(awk -F= '!/^#/ && $1 ~ /datadir/{print $2}' $config | xargs) - echo "# mysql_upgrade --datadir=$datadir" + socket=$(awk -F= '!/^#/ && $1 ~ /socket/{print $2}' $config | xargs) + echo "# mysql_upgrade ${socket:+--socket=$socket}" done ) | %banner -e %{name}-5.5 %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} %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/clusters.conf +%attr(755,root,root) %{_bindir}/ps_tokudb_admin %attr(755,root,root) %{_sbindir}/innochecksum %attr(755,root,root) %{_sbindir}/my_print_defaults %attr(755,root,root) %{_sbindir}/myisamchk %attr(755,root,root) %{_sbindir}/myisamlog %attr(755,root,root) %{_sbindir}/myisampack #%attr(755,root,root) %{_sbindir}/mysql_fix_privilege_tables +%attr(755,root,root) %{_sbindir}/mysql_plugin %attr(755,root,root) %{_sbindir}/mysql_upgrade %attr(755,root,root) %{_sbindir}/mysqlcheck %attr(755,root,root) %{_sbindir}/mysqld %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugin %attr(755,root,root) %{_libdir}/%{name}/plugin/adt_null.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/audit_log.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam_compat.so %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/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/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/handlersocket.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv1a_udf.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv_udf.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libmurmur_udf.so %attr(755,root,root) %{_libdir}/%{name}/plugin/mypluglib.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/mysql_no_login.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/query_response_time.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/scalability_metrics.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/sphinx.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_sphinx.so %endif # for plugins %attr(755,root,root) %{_libdir}/libmysqlservices.so @@ -1009,13 +949,14 @@ done %{_mandir}/man1/myisamlog.1* %{_mandir}/man1/myisampack.1* #%{_mandir}/man1/mysql_fix_privilege_tables.1* +%{_mandir}/man1/mysql_plugin.1* %{_mandir}/man1/mysql_upgrade.1* %{_mandir}/man1/mysqlcheck.1* %{_mandir}/man8/mysqld.8* %if %{?debug:1}0 %attr(755,root,root) %{_bindir}/*resolve_stack_dump -%{_datadir}/%{name}/mysqld.sym +%{_datadir}/%{_orgname}/mysqld.sym %{_mandir}/man1/*resolve_stack_dump.1* %endif @@ -1026,43 +967,46 @@ done %attr(750,mysql,mysql) %dir /var/log/archive/mysql %attr(640,mysql,mysql) %ghost /var/log/mysql/* -%{_infodir}/mysql.info* # 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_system_tables_data.sql -%{_datadir}/%{name}/mysql_test_data_timezone.sql - -%{_datadir}/%{name}/english -%{_datadir}/%{name}/fill_help_tables.sql -#%{_datadir}/%{name}/mysql_fix_privilege_tables.sql -%lang(cs) %{_datadir}/%{name}/czech -%lang(da) %{_datadir}/%{name}/danish -%lang(de) %{_datadir}/%{name}/german -%lang(el) %{_datadir}/%{name}/greek -%lang(es) %{_datadir}/%{name}/spanish -%lang(et) %{_datadir}/%{name}/estonian -%lang(fr) %{_datadir}/%{name}/french -%lang(hu) %{_datadir}/%{name}/hungarian -%lang(it) %{_datadir}/%{name}/italian -%lang(ja) %{_datadir}/%{name}/japanese -%lang(ko) %{_datadir}/%{name}/korean -%lang(nl) %{_datadir}/%{name}/dutch -%lang(nb) %{_datadir}/%{name}/norwegian -%lang(nn) %{_datadir}/%{name}/norwegian-ny -%lang(pl) %{_datadir}/%{name}/polish -%lang(pt) %{_datadir}/%{name}/portuguese -%lang(ro) %{_datadir}/%{name}/romanian -%lang(ru) %{_datadir}/%{name}/russian -%lang(sr) %{_datadir}/%{name}/serbian -%lang(sk) %{_datadir}/%{name}/slovak -%lang(sv) %{_datadir}/%{name}/swedish -%lang(uk) %{_datadir}/%{name}/ukrainian +%{_datadir}/%{_orgname}/mysqld.conf +%{_datadir}/%{_orgname}/mysql_security_commands.sql +%{_datadir}/%{_orgname}/mysql_system_tables_data.sql +%{_datadir}/%{_orgname}/mysql_system_tables.sql +%{_datadir}/%{_orgname}/mysql_test_data_timezone.sql + +%{_datadir}/%{_orgname}/english +%{_datadir}/%{_orgname}/dictionary.txt +%{_datadir}/%{_orgname}/fill_help_tables.sql +%{_datadir}/%{_orgname}/innodb_memcached_config.sql +#%{_datadir}/%{_orgname}/mysql_fix_privilege_tables.sql +%lang(bg) %{_datadir}/%{_orgname}/bulgarian +%lang(cs) %{_datadir}/%{_orgname}/czech +%lang(da) %{_datadir}/%{_orgname}/danish +%lang(de) %{_datadir}/%{_orgname}/german +%lang(el) %{_datadir}/%{_orgname}/greek +%lang(es) %{_datadir}/%{_orgname}/spanish +%lang(et) %{_datadir}/%{_orgname}/estonian +%lang(fr) %{_datadir}/%{_orgname}/french +%lang(hu) %{_datadir}/%{_orgname}/hungarian +%lang(it) %{_datadir}/%{_orgname}/italian +%lang(ja) %{_datadir}/%{_orgname}/japanese +%lang(ko) %{_datadir}/%{_orgname}/korean +%lang(nl) %{_datadir}/%{_orgname}/dutch +%lang(nb) %{_datadir}/%{_orgname}/norwegian +%lang(nn) %{_datadir}/%{_orgname}/norwegian-ny +%lang(pl) %{_datadir}/%{_orgname}/polish +%lang(pt) %{_datadir}/%{_orgname}/portuguese +%lang(ro) %{_datadir}/%{_orgname}/romanian +%lang(ru) %{_datadir}/%{_orgname}/russian +%lang(sr) %{_datadir}/%{_orgname}/serbian +%lang(sk) %{_datadir}/%{_orgname}/slovak +%lang(sv) %{_datadir}/%{_orgname}/swedish +%lang(uk) %{_datadir}/%{_orgname}/ukrainian %files charsets %defattr(644,root,root,755) -%dir %{_datadir}/mysql -%{_datadir}/%{name}/charsets +%dir %{_datadir}/%{_orgname} +%{_datadir}/%{_orgname}/charsets %files extras %defattr(644,root,root,755) @@ -1097,6 +1041,7 @@ done %attr(755,root,root) %{_bindir}/mysql_zap %attr(755,root,root) %{_bindir}/mysqlaccess %attr(755,root,root) %{_bindir}/mysqldumpslow +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysqlaccess.conf %{_mandir}/man1/mysql_convert_table_format.1* %{_mandir}/man1/mysql_find_rows.1* %{_mandir}/man1/mysql_fix_extensions.1* @@ -1112,6 +1057,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 @@ -1119,6 +1065,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* @@ -1127,6 +1074,7 @@ done %defattr(644,root,root,755) %attr(751,root,root) %dir %{_sysconfdir}/mysql %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mysql-client.conf +%{_sysconfdir}/%{name}/my.cnf %attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libmysqlclient.so.18 %attr(755,root,root) %{_libdir}/libmysqlclient_r.so.*.*.* @@ -1144,6 +1092,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*