Hello community, here is the log from the commit of package mysql checked in at Fri Jul 27 13:04:41 CEST 2007. -------- --- mysql/mysql.changes 2007-07-02 11:01:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-07-27 11:15:41.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 27 11:14:56 CEST 2007 - mmarek@suse.cz + +- updated to 5.0.45, for changes see + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-45.html + +------------------------------------------------------------------- Old: ---- comp_sql.c minmem mysql-5.0.41.tar.bz2 mysql-coredump.patch mysql_upgrade.c mysql_upgrade.patch New: ---- mysql-5.0.45.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.c25171/_old 2007-07-27 13:04:23.000000000 +0200 +++ /var/tmp/diff_new_pack.c25171/_new 2007-07-27 13:04:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mysql (Version 5.0.41) +# spec file for package mysql (Version 5.0.45) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,10 +12,10 @@ Name: mysql BuildRequires: gcc-c++ ncurses-devel openssl-devel procps pwdutils readline-devel tcpd-devel zlib-devel -License: GPL v2 or later, individual distribution permission before version 3.23.xx +License: GPL v2 only, individual distribution permission before version 3.23.xx Group: Productivity/Databases/Servers -Version: 5.0.41 -Release: 14 +Version: 5.0.45 +Release: 1 # required by rcmysql Requires: mysql-client = %{version} Autoreqprov: on @@ -28,17 +28,13 @@ Source3: README.debug Source4: suse-test-run Source5: mysql.SuSEfirewall2 -Source6: mysql_upgrade.c -Source7: comp_sql.c Patch2: mysql-cnf.patch Patch3: mysql-build-only-server.patch Patch4: mysql-group.patch Patch5: mysql-install_db-quiet.patch Patch6: mysql-4x-compat.patch Patch7: mysql-logrotate.patch -Patch10: mysql-coredump.patch Patch11: mysql-5.0.33-compiler-warnings.patch -Patch12: mysql_upgrade.patch Patch13: mysql_upgrade-exit-status.patch Patch14: mysql-5.0.33-defaults-extra-file.patch Patch15: mysql-vpath.patch @@ -255,21 +251,14 @@ %prep %setup -q cp %_sourcedir/suse-test-run . -# diffing the old and new version would be an overkill, instead we -# copy the new version -cp %_sourcedir/mysql_upgrade.c client/ -cp %_sourcedir/comp_sql.c scripts/ -# but overwriting it forever woulnd't be nice -test %version = 5.0.41 %patch2 -%patch3 +# needs some porting +#%patch3 %patch4 %patch5 %patch6 %patch7 -%patch10 %patch11 -%patch12 %patch13 %patch14 %patch15 @@ -294,7 +283,7 @@ # support assembler speedups. suffix="$1"; shift mkdir _build$suffix - cd _build$suffix + pushd _build$suffix export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing" export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" ../configure \ @@ -339,9 +328,9 @@ cp -a ../sql/share/{english,charsets} sql/share/ cp -a ../scripts/*.sql scripts/ %if %{?_with_testsuite:1}0 - make test + pushd mysql-test; perl ./mysql-test-run.pl --force; popd %endif - cd .. + popd } # Build the client, extra tools, libraries and mysqld-max BuildMySQL "-max" --with-server-suffix=-Max \ @@ -564,6 +553,9 @@ %files tools -f mysql-tools.files %changelog +* Fri Jul 27 2007 - mmarek@suse.cz +- updated to 5.0.45, for changes see + http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-45.html * Mon Jul 02 2007 - mmarek@suse.cz - mysql_upgrade: don't fail if the db is already up-to-date [#287209] (mysql_upgrade-exit-status.patch) ++++++ mysql-5.0.41.tar.bz2 -> mysql-5.0.45.tar.bz2 ++++++ mysql/mysql-5.0.41.tar.bz2 /mounts/work_src_done/STABLE/mysql/mysql-5.0.45.tar.bz2 differ: byte 11, line 1 ++++++ mysql_upgrade-exit-status.patch ++++++ --- /var/tmp/diff_new_pack.c25171/_old 2007-07-27 13:04:23.000000000 +0200 +++ /var/tmp/diff_new_pack.c25171/_new 2007-07-27 13:04:23.000000000 +0200 @@ -1,5 +1,10 @@ returning non-zero exit status in this case is not nice to scripts using mysql_upgrade (eg. our init script) +--- + client/mysql_upgrade.c | 4 +++- + mysql-test/t/mysql_upgrade.test | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + --- client/mysql_upgrade.c.orig +++ client/mysql_upgrade.c @@ -758,7 +758,9 @@ int main(int argc, char **argv) @@ -13,3 +18,14 @@ } /* +--- mysql-test/t/mysql_upgrade.test.orig ++++ mysql-test/t/mysql_upgrade.test +@@ -19,7 +19,7 @@ file_exists $MYSQLTEST_VARDIR/master-dat + + --echo Run it again - should say already completed + --replace_result $MYSQL_SERVER_VERSION VERSION +---error 1 ++--error 0 + --exec $MYSQL_UPGRADE --skip-verbose 2>&1 + + # It should have created a file in the MySQL Servers datadir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org