Hello community, here is the log from the commit of package mysql checked in at Thu Jun 7 13:15:34 CEST 2007. -------- --- mysql/mysql.changes 2007-06-01 09:16:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-06-06 11:44:18.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jun 4 15:14:50 CEST 2007 - mmarek@suse.cz + +- updated the mysql-test package (there are still some failures + that don't occur during build-time tests) +- use a new version of the mysql_upgrade program, which finally + handles errors from /usr/bin/mysql correctly + +------------------------------------------------------------------- Old: ---- minmem mysql-5.0.33-mysql_upgrade.patch mysql-testsuite.patch New: ---- comp_sql.c mysql_upgrade.c mysql_upgrade.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.c29730/_old 2007-06-07 13:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.c29730/_new 2007-06-07 13:15:21.000000000 +0200 @@ -15,7 +15,7 @@ License: GNU General Public License (GPL), individual distribution permission before version 3.23.xx Group: Productivity/Databases/Servers Version: 5.0.41 -Release: 5 +Release: 9 # required by rcmysql Requires: mysql-client = %{version} Autoreqprov: on @@ -28,7 +28,8 @@ Source3: README.debug Source4: suse-test-run Source5: mysql.SuSEfirewall2 -Patch1: mysql-testsuite.patch +Source6: mysql_upgrade.c +Source7: comp_sql.c Patch2: mysql-cnf.patch Patch3: mysql-build-only-server.patch Patch4: mysql-group.patch @@ -37,7 +38,7 @@ Patch7: mysql-logrotate.patch Patch10: mysql-coredump.patch Patch11: mysql-5.0.33-compiler-warnings.patch -Patch12: mysql-5.0.33-mysql_upgrade.patch +Patch12: mysql_upgrade.patch Patch13: mysql-5.0.33-defaults-extra-file.patch Patch14: mysql-vpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -253,7 +254,12 @@ %prep %setup -q cp %_sourcedir/suse-test-run . -#%patch1 +# 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 %patch4 @@ -434,9 +440,8 @@ install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/mysql # testsuite -sed 's/%%{mysql_binary}/mysqld/g' <suse-test-run >$RPM_BUILD_ROOT/usr/share/mysql-test/suse-test-run -sed 's/%%{mysql_binary}/mysqld-max/g' <suse-test-run >$RPM_BUILD_ROOT/usr/share/mysql-test/suse-test-run-Max -chmod +x $RPM_BUILD_ROOT/usr/share/mysql-test/suse-test-run* +install -m 755 suse-test-run $RPM_BUILD_ROOT/usr/share/mysql-test/ +ln -s suse-test-run $RPM_BUILD_ROOT/usr/share/mysql-test/suse-test-run-max # XXX this should go under /var/..., but some tests get confused by a symlink # var -> ../../../var/... #ln -sf ../../../var/lib/mysql/mysql-test $RPM_BUILD_ROOT/usr/share/mysql-test/var @@ -557,6 +562,11 @@ %files tools -f mysql-tools.files %changelog +* Mon Jun 04 2007 - mmarek@suse.cz +- updated the mysql-test package (there are still some failures + that don't occur during build-time tests) +- use a new version of the mysql_upgrade program, which finally + handles errors from /usr/bin/mysql correctly * Fri Jun 01 2007 - mmarek@suse.cz - fixed build for older distributions in the buildservice * Tue May 29 2007 - mmarek@suse.de ++++++ mysql_upgrade.patch ++++++ This is needed to build new mysql_upgrade.c --- scripts/Makefile.am.orig +++ scripts/Makefile.am @@ -15,6 +15,11 @@ ## Process this file with automake to create Makefile.in +BUILT_SOURCES = mysql_fix_privilege_tables.sql \ + mysql_fix_privilege_tables_sql.c + +EXTRA_PROGRAMS = comp_sql + bin_SCRIPTS = @server_scripts@ \ msql2mysql \ mysql_config \ @@ -65,6 +70,7 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ mysqlaccess.conf \ mysqlbug \ make_win_bin_dist \ + mysql_fix_privilege_tables_sql.c \ mysql_system_tables_fix.sql dist_pkgdata_DATA = fill_help_tables.sql \ @@ -97,7 +103,7 @@ CLEANFILES = @server_scripts@ \ # mysqlbug should be distributed built so that people can report build # failures with it. -DISTCLEANFILES = mysqlbug +DISTCLEANFILES = $(BUILT_SOURCES) mysqlbug # We want the right version and configure comand line in mysqlbug mysqlbug: ${top_builddir}/config.status mysqlbug.sh @@ -110,6 +116,20 @@ mysql_fix_privilege_tables.sql: mysql_sy @echo "Building $@"; @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@ +# +# Build mysql_fix_privilege_tables_sql.c from +# mysql_fix_privileges_tables.sql using comp_sql +# The "sleep" ensures the generated file has a younger timestamp than its source +# (which may have been generated in this very same "make" run). +# +mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql + $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) + sleep 2 + $(top_builddir)/scripts/comp_sql$(EXEEXT) \ + mysql_fix_privilege_tables \ + $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ + + SUFFIXES = .sh .sh: --- Makefile.am.orig +++ Makefile.am @@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ - @readline_topdir@ sql-common \ + @readline_topdir@ sql-common scripts \ @thread_dirs@ pstack \ - @sql_union_dirs@ scripts @man_dirs@ @tests_dirs@ \ + @sql_union_dirs@ @man_dirs@ @tests_dirs@ \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ --- include/my_global.h.orig +++ include/my_global.h @@ -86,6 +86,14 @@ #endif #endif /* _WIN32... */ +/* Make it easier to add conditionl code for windows */ +#ifdef __WIN__ +#define IF_WIN(A,B) (A) +#else +#define IF_WIN(A,B) (B) +#endif + + /* Some defines to avoid ifdefs in the code */ #ifndef NETWARE_YIELD #define NETWARE_YIELD --- sql/mysql_priv.h.orig +++ sql/mysql_priv.h @@ -270,7 +270,6 @@ MY_LOCALE *my_locale_by_number(uint numb #endif #if defined(__WIN__) || defined(OS2) -#define IF_WIN(A,B) (A) #undef FLUSH_TIME #define FLUSH_TIME 1800 /* Flush every half hour */ @@ -279,7 +278,6 @@ MY_LOCALE *my_locale_by_number(uint numb #define WAIT_PRIOR 0 #define QUERY_PRIOR 2 #else -#define IF_WIN(A,B) (B) #define INTERRUPT_PRIOR 10 #define CONNECT_PRIOR 9 #define WAIT_PRIOR 8 ++++++ suse-test-run ++++++ --- mysql/suse-test-run 2006-11-23 11:27:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql/suse-test-run 2007-06-06 11:42:21.000000000 +0200 @@ -1,17 +1,22 @@ -#!/bin/sh -e +#!/usr/bin/perl # # Test the SUSE mysql(-Max) package using the MySQL testsuite -cd /usr/share/mysql-test -if test -n "`/bin/ls var`"; then - echo "removing temporary files from previous test run" - rm -rf var/* -fi +my $id = getpwnam("mysql") or die "can't find user \"mysql\": $!"; +my $dir = "/usr/share/mysql-test/"; +my $binary = "/usr/sbin/mysqld"; -if test "`whoami`" = "root"; then - echo "running as root makes rpl_rotate_logs fail, switchig to user mysql" - exec su mysql -c "$0 $*" -fi +if ($< == 0) { + ($<, $>) = ($id, $id); + if ($< != $id || $> != $id) { + die "can't switch to user mysql(id $id): $!"; + } +} -set -x -./mysql-test-run --master-binary=/usr/sbin/%{mysql_binary} --slave-binary=/usr/sbin/%{mysql_binary} --big-test "$@" +if ($0 =~ /\/suse-test-run-max$/i) { + $binary .= "-max"; +} + +chdir($dir) or die "can't cd to $dir: $!"; +exec("./mysql-test-run.pl", "--master-binary=$binary", "--slave-binary=$binary", "--big-test", @ARGV); +die "can't execute mysql-test-run.pl: $!"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org