
Hello community, here is the log from the commit of package mysql checked in at Mon May 28 23:46:17 CEST 2007. -------- --- mysql/mysql.changes 2007-03-29 13:57:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-05-28 10:41:22.000000000 +0200 @@ -1,0 +2,14 @@ +Mon May 28 10:34:45 CEST 2007 - mmarek@suse.cz + +- updated to 5.0.41, for changes see + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-37.html + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-41.html +- fixed --with testsuite build [#252630] +- renamed subpackages according to library packaging policy: + mysql-shared -> libmysqlclient15, libmysqlclient_r15 + mysql-devel -> libmysqlclient-devel (pulls in both flavors) +- increased rcmysql start timeout to 30 seconds, don't return + failure if mysql doesn't start early enough (except for update + case) [#273938] + +------------------------------------------------------------------- Old: ---- minmem mysql-5.0.33.tar.bz2 mysql-5.0.33-vpath.patch New: ---- mysql-5.0.41.tar.bz2 mysql-vpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mysql (Version 5.0.33) +# spec file for package mysql (Version 5.0.41) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ BuildRequires: gcc-c++ ncurses-devel openssl-devel procps pwdutils readline-devel tcpd-devel zlib-devel License: GNU General Public License (GPL) Group: Productivity/Databases/Servers -Version: 5.0.33 -Release: 5 +Version: 5.0.41 +Release: 1 # required by rcmysql Requires: mysql-client = %{version} Autoreqprov: on @@ -39,7 +39,7 @@ Patch11: mysql-5.0.33-compiler-warnings.patch Patch12: mysql-5.0.33-mysql_upgrade.patch Patch13: mysql-5.0.33-defaults-extra-file.patch -Patch14: mysql-5.0.33-vpath.patch +Patch14: mysql-vpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,17 +73,18 @@ Michael Widenius <monty@mysql.com> David Axmark <davida@mysql.com> -%package devel -Obsoletes: mysqldev -Provides: mysqldev -Requires: mysql-shared = %{version} glibc-devel zlib-devel openssl-devel +%package -n libmysqlclient-devel +# mysql-devel was last used in openSUSE 10.2 +Provides: mysql-devel = %{version}-%{release} +Obsoletes: mysql-devel <= 5.0.26 +Requires: libmysqlclient = %{version} libmysqlclient_r = %{version} glibc-devel zlib-devel openssl-devel License: GNU General Public License (GPL) Summary: MySQL Development Header Files and Libraries URL: http://www.mysql.com Group: Development/Libraries/C and C++ Autoreqprov: on -%description devel +%description -n libmysqlclient-devel This package contains the development header files and libraries necessary to develop MySQL client applications. @@ -95,8 +96,6 @@ David Axmark <davida@mysql.com> %package client -Obsoletes: mysqclnt -Provides: mysqclnt License: GNU General Public License (GPL) Summary: MySQL Client URL: http://www.mysql.com @@ -114,8 +113,6 @@ David Axmark <davida@mysql.com> %package bench -Obsoletes: mysqbnch -Provides: mysqbnch Requires: mysql-client perl-DBD-mysql License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: MySQL - Benchmarks @@ -136,16 +133,32 @@ Michael Widenius <monty@mysql.com> David Axmark <davida@mysql.com> -%package shared -Obsoletes: mysqllib -Provides: mysqllib +%package -n libmysqlclient15 Summary: MySQL Shared Libraries License: GNU General Public License (GPL) URL: http://www.mysql.com Group: Development/Libraries/Other Autoreqprov: on -%description shared +%description -n libmysqlclient15 +This package contains the shared libraries (.so) which certain +languages and applications need to dynamically load and use MySQL. + + + +Authors: +-------- + Michael Widenius <monty@mysql.com> + David Axmark <davida@mysql.com> + +%package -n libmysqlclient_r15 +Summary: MySQL Shared Libraries +License: GNU General Public License (GPL) +URL: http://www.mysql.com +Group: Development/Libraries/Other +Autoreqprov: on + +%description -n libmysqlclient_r15 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MySQL. @@ -240,7 +253,7 @@ %prep %setup -q cp %_sourcedir/suse-test-run . -%patch1 +#%patch1 %patch2 %patch3 %patch4 @@ -253,7 +266,8 @@ %patch13 %patch14 # remove unneeded man manpages -rm man/mysqlman.1 man/safe_mysqld.1 man/mysql.server.1 +rm man/mysqlman.1 man/safe_mysqld.1 man/mysql.server.1 man/make_win_*.1 +rm man/mysqlmanager-pwgen.1 man/mysqlmanagerc.1 %build autoreconf -f -i @@ -306,6 +320,12 @@ %endif make %{?jobs:-j%jobs} benchdir=$RPM_BUILD_ROOT/usr/share/sql-bench nm --numeric-sort sql/mysqld > sql/mysqld.sym + # needed for make check, which is not VPATH aware + # copy the files unconditionally so that manual 'make check' after + # the build works, too + cp -a ../mysql-test/* mysql-test/ + cp -a ../sql/share/{english,charsets} sql/share/ + cp -a ../scripts/*.sql scripts/ %if %{?_with_testsuite:1}0 make test %endif @@ -318,7 +338,7 @@ --with-innodb \ --with-embedded-server \ --with-extra-tools -# build mysqld-debug +# build mysqld-debug (speed up normal build by skipping tests/ and client/) BuildMySQL "-debug" --with-server-suffix=-debug \ --${BERKELEY}-berkeley-db \ --with-openssl \ @@ -326,9 +346,11 @@ --with-debug \ --without-extra-tools \ --without-embedded-server \ +%if %{?!_with_testsuite:1}0 + --without-mysqlmanager \ --without-client \ - --without-tests \ - --without-mysqlmanager + --without-tests +%endif # Now build the standard mysqld BuildMySQL "" \ --without-berkeley-db \ @@ -336,9 +358,11 @@ --with-innodb \ --without-extra-tools \ --without-embedded-server \ +%if %{?!_with_testsuite:1}0 + --without-mysqlmanager \ --without-client \ - --without-tests \ - --without-mysqlmanager + --without-tests +%endif %install # install client, extra tools, libraries and mysql-max @@ -380,8 +404,8 @@ } filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_create_system_tables mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip >mysql.files filelist mysql mysql_upgrade mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files -filelist comp_err mysql_config >mysql-devel.files -filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files +filelist comp_err mysql_config >libmysqlclient-devel.files +filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded mysql-stress-test.pl mysql-test-run.pl >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) filelist msql2mysql mysql_convert_table_format mysql_explain_log mysql_find_rows mysql_setpermission mysql_tableinfo mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files @@ -481,7 +505,7 @@ %defattr(-, root, root) %config /etc/mysqlaccess.conf -%files devel -f mysql-devel.files +%files -n libmysqlclient-devel -f libmysqlclient-devel.files %defattr(-, root, root) /usr/include/mysql %dir %{_libdir}/mysql @@ -498,10 +522,15 @@ /usr/bin/mysqltestmanager-pwgen /usr/bin/mysqltestmanagerc -%files shared +%files -n libmysqlclient15 +%defattr(-, root, root) +%{_libdir}/libmysqlclient.so.* +%{_libdir}/mysql/libmysqlclient.so.* + +%files -n libmysqlclient_r15 %defattr(-, root, root) -%{_libdir}/*.so.* -%{_libdir}/mysql/*.so.* +%{_libdir}/libmysqlclient_r.so.* +%{_libdir}/mysql/libmysqlclient_r.so.* %files Max %defattr(-, root, root) @@ -521,6 +550,17 @@ %files tools -f mysql-tools.files %changelog +* Mon May 28 2007 - mmarek@suse.cz +- updated to 5.0.41, for changes see + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-37.html + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-41.html +- fixed --with testsuite build [#252630] +- renamed subpackages according to library packaging policy: + mysql-shared -> libmysqlclient15, libmysqlclient_r15 + mysql-devel -> libmysqlclient-devel (pulls in both flavors) +- increased rcmysql start timeout to 30 seconds, don't return + failure if mysql doesn't start early enough (except for update + case) [#273938] * Thu Mar 29 2007 - mmarek@suse.de - BuildRequires fixes: + ncurses-devel ++++++ mysql-5.0.33-mysql_upgrade.patch ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,7 +1,7 @@ # reported as http://bugs.mysql.com/bug.php?id=26639 ---- client/mysql_upgrade.c +--- client/mysql_upgrade.c.orig +++ client/mysql_upgrade.c -@@ -584,6 +584,15 @@ int main(int argc, char **argv) +@@ -614,6 +614,15 @@ int main(int argc, char **argv) ret= system(cmdline.str); if (ret) { @@ -17,8 +17,8 @@ fprintf(stderr, "Error executing '%s'\n", cmdline.str); goto error; } -@@ -640,7 +649,14 @@ fix_priv_tables: - +@@ -694,7 +703,14 @@ fix_priv_tables: + DBUG_PRINT("info", ("Running: %s", cmdline.str)); ret= system(cmdline.str); if (ret) + { ++++++ mysql-5.0.33.tar.bz2 -> mysql-5.0.41.tar.bz2 ++++++ mysql/mysql-5.0.33.tar.bz2 /mounts/work_src_done/STABLE/mysql/mysql-5.0.41.tar.bz2 differ: byte 11, line 1 ++++++ mysql-coredump.patch ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,8 +1,8 @@ # The kernel won't generate coredumps after setgid() and setuid() # unless prctl(PR_SET_DUMPABLE, 1) is called ---- sql/mysqld.cc +--- sql/mysqld.cc.orig +++ sql/mysqld.cc -@@ -132,6 +132,10 @@ extern "C" { // Because of SCO 3.2V4 +@@ -135,6 +135,10 @@ extern "C" { // Because of SCO 3.2V4 #include <sys/mman.h> #endif @@ -13,8 +13,8 @@ #ifdef __NETWARE__ #define zVOLSTATE_ACTIVE 6 #define zVOLSTATE_DEACTIVE 2 -@@ -1368,7 +1372,13 @@ static void set_user(const char *user, s - sql_perror("setuid"); +@@ -1411,7 +1415,13 @@ static void set_effective_user(struct pa + sql_perror("setreuid"); unireg_abort(1); } -#endif @@ -28,9 +28,9 @@ } ---- configure.in +--- configure.in.orig +++ configure.in -@@ -2226,6 +2226,19 @@ then +@@ -2266,6 +2266,19 @@ then fi AC_MSG_RESULT("$netinet_inc") ++++++ mysql-install_db-quiet.patch ++++++ --- /var/tmp/diff_new_pack.M32360/_old 2007-05-28 23:45:54.000000000 +0200 +++ /var/tmp/diff_new_pack.M32360/_new 2007-05-28 23:45:54.000000000 +0200 @@ -1,40 +1,18 @@ ---- scripts/mysql_install_db.sh +--- scripts/mysql_install_db.sh.orig +++ scripts/mysql_install_db.sh -@@ -246,13 +246,14 @@ then - echo "" +@@ -296,10 +296,11 @@ then fi fi -- if test "$in_rpm" = 0 -a "$windows" = 0 -- then -- echo "" -- echo "To start mysqld at boot time you have to copy support-files/mysql.server" -- echo "to the right place for your system" -- echo -- fi + +- s_echo "" +- s_echo "To start mysqld at boot time you have to copy" +- s_echo "support-files/mysql.server to the right place for your system" +- s_echo +# Output disabled, since the SUSE RPM comes with an init script installed -+# if test "$in_rpm" = 0 -a "$windows" = 0 -+# then -+# echo "" -+# echo "To start mysqld at boot time you have to copy support-files/mysql.server" -+# echo "to the right place for your system" -+# echo -+# fi ++# s_echo "" ++# s_echo "To start mysqld at boot time you have to copy" ++# s_echo "support-files/mysql.server to the right place for your system" ++# s_echo + if test "$windows" -eq 0 then - echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" -@@ -272,9 +273,12 @@ then - echo - if test "$in_rpm" = "0" - then -- echo "You can start the MySQL daemon with:" -- echo "cd @prefix@ ; $bindir/mysqld_safe &" -- echo -+# Disabled the following message, since it is recommended to use the init -+# script instead, which takes care using the correct user id etc. Start it -+# with "rcmysql start" instead. -+# echo "You can start the MySQL daemon with:" -+# echo "cd @prefix@ ; $bindir/mysqld_safe &" -+# echo - echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:" - echo "cd sql-bench ; perl run-all-tests" - echo ++++++ mysql-vpath.patch ++++++ --- configure.in.orig +++ configure.in @@ -2494,7 +2494,7 @@ else MYSQL_CHECK_NEW_RL_INTERFACE MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY AC_LANG_RESTORE - if [test "$mysql_cv_new_rl_interface" = "yes"] && [test -d "./cmd-line-utils/readline"] + if [test "$mysql_cv_new_rl_interface" = "yes"] && [test -d "$srcdir/cmd-line-utils/readline"] then # Use the new readline interface, but only if the package includes a bundled libreadline # this way we avoid linking commercial source with GPL readline @@ -2511,7 +2511,7 @@ else fi # if there is no readline, but we want to build with readline, we fail -if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"] +if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"] then AC_MSG_ERROR([This commercially licensed MySQL source package can't be built with libreadline. Please use --with-libedit to use ++++++ rc.mysql ++++++ --- mysql/rc.mysql 2007-02-26 13:54:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql/rc.mysql 2007-05-24 13:37:59.000000000 +0200 @@ -92,7 +92,7 @@ wait_for_socket() { local i - for((i=0; i<50; i++)); do + for((i=0; i<150; i++)); do sleep 0.2 test -S $1 && i='' && break done @@ -253,7 +253,8 @@ --datadir=$datadir &>/dev/null & wait_for_socket $socket || { - rc_failed; rc_status -v; rc_exit; + # let's not treat this as a fatal error + echo "warning: $socket didn't appear within 30 seconds" } # Rmember status and be verbose ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de