diff --git a/baselibs.conf b/baselibs.conf index f28702c..ad6c1ab 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libmysqlclient16 -libmysqlclient_r16 +libmariadbclient16 +libmariadbclient_r16 diff --git a/build.inc b/build.inc index 386ff2e..1918c73 100644 --- a/build.inc +++ b/build.inc @@ -3,13 +3,14 @@ %else %define socketpath /var/run/mysql %endif -autoreconf -f -i -export WARN_DIS=" -Wno-unused-parameter " %if 0%{?suse_version} > 1140 -export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable " +export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter " %endif -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS" +export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS " export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" + +%if 0%{use_cmake} < 1 +autoreconf -f -i # Make the compile a function, since we do multiple builds BuildMySQL() { # The --enable-assembler simply does nothing on systems that do not @@ -18,7 +19,6 @@ BuildMySQL() { mkdir _build$suffix pushd _build$suffix ../configure \ - --with-libevent \ --enable-assembler \ --without-readline \ --infodir=%{_infodir} \ @@ -48,6 +48,7 @@ BuildMySQL() { %endif --with-ssl=/usr \ --with-plugins=%{builtin_plugins} \ + --without-plugin-handlersocket \ HOSTNAME="/bin/hostname -f" \ "$@" # Add this for MyISAM RAID support: @@ -69,7 +70,11 @@ BuildMySQL() { popd } # Build the client, extra tools, libraries +%if 0%{?prefered} > 0 +BuildMySQL "" --with-embedded-server +%else BuildMySQL "" --without-embedded-server +%endif # build mysqld-debug BuildMySQL "-debug" --with-debug --without-embedded-server @@ -85,3 +90,31 @@ rm -rf tmp cd .. %endif +%else # cmake build + +BuildMySQL() { + mkdir _build$1 + pushd _build$1 + shift + cmake -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DWITH_READLINE=0 \ + -DWITH_LIBEDIT=0 \ + -DINSTALL_LAYOUT=RPM \ + -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \ + -DWITH_COMMENT="openSUSE MySQL rpm" \ + -DWITH_EXTRA_CHARSET=all \ + -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ + -DWITH_EMBEDDED_SERVER=true \ + -DDENABLE_DOWNLOADS=false \ + "$@" .. + make %{?jobs:-j%jobs} + nm --numeric-sort sql/mysqld > sql/mysqld.sym + popd +} + +BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share +BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug +%endif diff --git a/changes.factory b/changes.factory deleted file mode 100644 index c5f8168..0000000 --- a/changes.factory +++ /dev/null @@ -1,1620 +0,0 @@ -------------------------------------------------------------------- -Tue May 25 14:44:15 CEST 2010 - mhrusecky@suse.cz - -- updated to MariaDB 5.1.44b - - important security related update - - changelog: - http://askmonty.org/wiki/Manual:MariaDB_5.1.44b_Release_Notes -- not obsoleting mysql, to make sure mysql gets replaced by - mysql-community-server by default - -------------------------------------------------------------------- -Mon Apr 26 10:34:41 CEST 2010 - mhrusecky@suse.cz - -- packaging MariaDB shared libraries to be used by client and tools - -------------------------------------------------------------------- -Wed Apr 7 10:26:52 CEST 2010 - mhrusecky@suse.cz - -- updated to MariaDB 5.1.44 - - changelog: - http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.44_Changelog - - release notes: - http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.44_Release_Notes - -------------------------------------------------------------------- -Wed Mar 17 17:44:37 UTC 2010 - mhrusecky@suse.cz - -- adapted to MariaDB 5.1.42 - - changelog: - http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.42_Changelog - - release notes: - http://askmonty.org/wiki/index.php/Manual:MariaDB_5.1.42_Release_Notes - -------------------------------------------------------------------- -Mon Mar 8 15:13:11 UTC 2010 - mhrusecky@suse.cz - -- updated to 5.1.44, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-43.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-44.html -- splitting out shared libmysqld shared library (quick dirty way) -- preparing spec file to be more general and easily adjustable to - other MySQL flavours - -------------------------------------------------------------------- -Sun Jan 10 00:57:25 CET 2010 - mhrusecky@suse.cz - -- updated to 5.1.42, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-42.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-38.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html - -------------------------------------------------------------------- -Tue Dec 15 01:23:16 CET 2009 - jengelh@medozas.de - -- add baselibs.conf as a source - -------------------------------------------------------------------- -Tue Dec 1 17:52:18 CET 2009 - mhrusecky@suse.cz - -- removing compatibility symlink - - intended for 11.2 but never get there -- fixing various security issues (bnc#557669) - - upstream #47320 - checking server certificates (CVE-2009-4028) - - upstream #48291 - error handling in subqueries (CVE-2009-4019) - - upstream #47780 - preserving null_value flag in GeomFromWKB() - (CVE-2009-4019) - - upstream #39277 - symlink behaviour fixed (CVE-2008-7247) - - upstream #32167 - symlink behaviour refixed (CVE-2009-4030) - -------------------------------------------------------------------- -Wed Nov 11 14:23:43 CET 2009 - mhrusecky@suse.cz - -- making pid file readable by everybody -- fixing 'rcmysql status' for non-root - -------------------------------------------------------------------- -Thu Oct 29 14:11:09 CET 2009 - mhrusecky@suse.cz - -- adding /var/lib/mysql/mysql.sock symlink for compatibility with - applications for older versions -- using kill instead of killproc as killproc matches by default all - running MySQL instances (even KDE ones) -- checking for log consistency in rc script instead of post of spec - as it makes more sense - -------------------------------------------------------------------- -Fri Oct 16 09:32:35 UTC 2009 - adrian@suse.de - -- fix PreRequires or mysql package can't be used in build enviroment -- do not fail on usermod call in %pre as specified - -------------------------------------------------------------------- -Mon Oct 12 18:36:04 UTC 2009 - coolo@novell.com - -- fix prereq for usermod - -------------------------------------------------------------------- -Mon Oct 5 11:11:35 CEST 2009 - mhrusecky@suse.cz - -- fixed my.cnf rights (bnc#539249) -- fixed restart on update (bnc#520876) - -------------------------------------------------------------------- -Tue Sep 15 16:45:23 CEST 2009 - mhrusecky@suse.cz - -- Few better formulations in README.SuSE (bnc#539243) - -------------------------------------------------------------------- -Tue Aug 25 10:19:04 CEST 2009 - mhrusecky@suse.cz - -- Refixing bnc#420313 so mysql_config will return better values - -------------------------------------------------------------------- -Wed Aug 12 13:29:09 CEST 2009 - mhrusecky@suse.cz - -- Using configure option to enforce pthreads rwlocks on s390 instead - of sed substitution - -------------------------------------------------------------------- -Tue Jul 28 17:10:31 CEST 2009 - mhrusecky@suse.cz - -- Applying upstream patch for upstream bug#43594 - (hotcopy will ignore log tables) (bnc#525325) -- Not using bmove512 as it may slow things down - (see upstream bug#19975) - -------------------------------------------------------------------- -Mon Jul 27 14:45:24 CEST 2009 - mhrusecky@suse.cz - -- Applying upstream patch for upstream bug#36259 - 'Optimizing with ORDER BY' - -------------------------------------------------------------------- -Fri Jul 24 17:35:07 CEST 2009 - dmueller@suse.de - -- fix baselibs.conf (bnc#525065) - -------------------------------------------------------------------- -Tue Jul 7 11:19:05 CEST 2009 - mhrusecky@suse.cz - -- updated to 5.1.36, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html - -------------------------------------------------------------------- -Fri Jun 26 11:09:34 CEST 2009 - mhrusecky@suse.cz - -- fixed rcmysql status - -------------------------------------------------------------------- -Tue Jun 23 19:33:08 CEST 2009 - mhrusecky@suse.cz - -- extra escaping in rc script just to be sure -- creating parent directories for logs when they don't exists -- rc script didn't always exited when it should -- checking for incompatible databases in way it can be logged - -------------------------------------------------------------------- -Fri Jun 19 13:17:44 CEST 2009 - mhrusecky@suse.cz - -- actualized README.SuSE - -------------------------------------------------------------------- -Tue Jun 16 14:32:00 CEST 2009 - mhrusecky@suse.cz - -- updated to 5.1.35, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html -- fixed some tests - -------------------------------------------------------------------- -Mon Jun 8 13:33:35 CEST 2009 - mhrusecky@suse.cz - -- putting all log files to subdirectory in /var/log - -------------------------------------------------------------------- -Mon Jun 1 18:33:43 CEST 2009 - mhrusecky@suse.cz - -- moving socket back to /var/lib/mysql for people with old distributions - -------------------------------------------------------------------- -Sat May 2 13:43:40 CEST 2009 - chris@computersalat.de - -- fdupes fix for fedora - -------------------------------------------------------------------- -Fri May 1 17:55:12 CEST 2009 - chris@computersalat.de - -- beautify spec file - o some if's to get Fedora, Centos build -- to minimize effort for admins - o with-charset=utf8 - o with-collation=utf8_unicode_ci - -------------------------------------------------------------------- -Thu Apr 30 10:58:29 CEST 2009 - mhrusecky@suse.cz - -- adding upgrade log - -------------------------------------------------------------------- -Tue Apr 28 18:33:22 CEST 2009 - mhrusecky@suse.cz - -- fixed update so only one at the time is allowed - -------------------------------------------------------------------- -Fri Apr 24 17:27:11 CEST 2009 - mhrusecky@suse.cz - -- updated to 5.1.34, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-34.html -- added README.SuSE with notes about version 5.1 -- fixed migration problem from 5.0.X regarding moved pidfile - -------------------------------------------------------------------- -Fri Apr 10 14:40:54 CEST 2009 - mhrusecky@suse.cz - -- Fixed SSL support on 64-bit machines - -------------------------------------------------------------------- -Tue Apr 7 18:33:16 CEST 2009 - mhrusecky@suse.cz - -- Merging with development version of MySQL 5.1 - - following changes were committed since - Mon Oct 1 19:55:46 CEST 2007 when package development was - branched - * Fri Apr 3 16:05:02 CEST 2009 - mhrusecky@suse.cz - - better fix for rc status - - my_safe_process moved to %_bindir - * Thu Apr 2 18:41:08 CEST 2009 - mhrusecky@suse.cz - - updated to 5.1.33, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-33.html - - fixed path dependent build of scripts - * Tue Mar 17 19:10:09 CET 2009 - mhrusecky@suse.cz - - localstatedir is back to /var/lib/mysql as it is used as - default value for datadir - - fixed upgrade using datadir - * Tue Mar 17 18:23:35 CET 2009 - mhrusecky@suse.cz - - mysql_install_db now uses group option too - - log file migrated to /var/log - * Thu Mar 12 18:07:24 CET 2009 - mhrusecky@suse.cz - - Fixing mysql-test so it can be installed in - /usr/share/mysql-test - * Mon Mar 9 20:17:32 CET 2009 - mhrusecky@suse.cz - - Adjusting suse-test-run as there is no longer mysql-Max - package - * Fri Mar 6 15:59:40 CET 2009 - mhrusecky@suse.cz - - updated to 5.1.32, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-32.html - - mysql-5.1.31-test-allowed-packets.patch no longer needed - as it was fixed upstream - * Tue Mar 3 19:53:11 CET 2009 - mhrusecky@suse.cz - - moving tmp and socket/pidfiles directories to the better - location - * Mon Mar 2 14:40:19 CET 2009 - mhrusecky@suse.cz - - dropping mysql-storage-plugins package (now part of mysql - base package) - * Fri Feb 27 16:04:57 CET 2009 - mhrusecky@suse.cz - - fixed main.variables-big test - * Thu Feb 26 17:48:51 CET 2009 - mhrusecky@suse.cz - - fixed federated plugin to avoid versioning - - fixed main.mysqlbinlog_row_big test - - fixed dependencies and other things because of dropped - mysql-Max - * Mon Feb 23 17:28:38 CET 2009 - mhrusecky@suse.cz - - updated to 5.1.31, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-31.html - * mysql-5.1.30-test-daemon-sbin.patch no longer needed as - something better was accepted upstream - * mysql-openssl-test.patch is already in upstream too - * Mon Feb 23 15:25:22 CET 2009 - mhrusecky@suse.cz - - dropping unused rc.mysql file - - fixed status detection - * Fri Feb 20 15:06:22 CET 2009 - mhrusecky@suse.cz - - innodb support compiled as a static part of MySQL - - getting rid of sysconfig - * Tue Jan 20 18:39:38 CET 2009 - mhrusecky@suse.cz - - automatic plugins loading - * Mon Jan 5 18:34:40 CET 2009 - mhrusecky@suse.cz - - init script checks for relative paths (bnc#463586) - * Mon Dec 8 17:27:29 CET 2008 - mhrusecky@suse.cz - - updated to 5.1.30, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-28.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-29.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-30.html - - indentation in rc scripts fixed (bnc#435519) - - more comments and minor fixes in spec file - - using symlinks for mysql-test-run and mtr as these are the - same files and they needs some patching - - fixed some of the automatic tests - - dropping some patches which are no longer used - * Thu Sep 25 12:05:46 CEST 2008 - mmarek@suse.cz - - merged init script changes from the 5.0 package - * Wed Jul 30 14:57:46 CEST 2008 - mmarek@suse.cz - - updated to 5.1.26-rc, see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-26.html - * Fri Jul 4 12:58:41 CEST 2008 - mmarek@suse.cz - - updated to 5.1.25-rc, for changes see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-24.html - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-25.html - * Fri Mar 14 14:19:36 CET 2008 - mmarek@suse.cz - - fixed mysqld_multi.patch (bnc#371000) - * Fri Mar 14 13:31:01 CET 2008 - mmarek@suse.cz - - add 'user = mysql' to mysqld_multi example groups - * Fri Mar 14 09:06:11 CET 2008 - mmarek@suse.cz - - dropped README.SUSE (bnc#357634) - - moved mysql_upgrade to the server package (bnc#366820) - * Thu Mar 13 17:29:32 CET 2008 - mmarek@suse.cz - - adjusted license tags - * Wed Mar 12 18:48:52 CET 2008 - mmarek@suse.cz - - finally convert err-log to log-error in my.cnf - * Wed Mar 12 17:58:03 CET 2008 - mmarek@suse.cz - - shortened the comment in sysconfig.mysql, a detailed - description or HOWTO can be added to a README (created a - draft) - * Wed Mar 12 16:03:16 CET 2008 - mmarek@suse.cz - - don't preinstall /var/lib/mysql-databases, create datadirs - in mysqld_multi on first startup insteal - * Tue Mar 11 13:38:33 CET 2008 - mmarek@suse.cz - - updated to 5.1.23-rc - * fixes CVE-2007-5970 - * for other changes see - http://dev.mysql.com/doc/refman/5.1/en/news-5-1-23.html - * Tue Feb 12 12:00:00 CET 2008 - richard@radoeka.nl - - Added multi database support by - o updating /etc/init.d/mysql, it has now 2 legs the existing - one to start a single database, and a new one to start and - stop multiple database. - o Added a sysconfig variable - o Added a directory /var/lib/mysql-databases to hold - databases, - o Updated /etc/my.cnf with some examples database - configurations - * Fri Nov 9 15:51:08 CET 2007 - mmarek@suse.cz - - removed the sles9 workaround that's not needed anymore and - breaks sles9 builds instead - * Wed Oct 10 22:30:44 CEST 2007 - mmarek@suse.cz - - merged the standard and Max server packages - - example, csv and federated storage engines are packaged in - mysql-storage-plugins - - build the NDB cluster: - * mysql-ndb-storage - * mysql-ndb-management - * mysql-ndb-tools - * mysql-ndb-extra - - removed libmysqlclient static libraries and .la files - - moved libmysqlclient and libmysqld to %%_libdir, %%_libdir/mysql - will only be used for the server plugins - * Mon Oct 1 19:55:46 CEST 2007 - mmarek@suse.cz - - initial 5.1 packaging (5.1.22-rc) - * ported the 5.0 spec file to make it build at least - * highlights from the "What's New" list - (http://dev.mysql.com/doc/refman/5.1/en/mysql-nutshell.html): - - table partitioning - - plugin API - - event scheduler - - basic XML functions (ExtractValue() and UpdateXML()) - - mysqlslap load emulator - -------------------------------------------------------------------- -Mon Mar 30 01:05:45 CEST 2009 - crrodriguez@suse.de - -- configure flag --with-pic is not really used for libmysqld.a - restore -fPIC in CFLAGS - -------------------------------------------------------------------- -Tue Mar 3 02:15:37 CET 2009 - crrodriguez@suse.de - -- use --disable-static, note that this will only - remove static libraries that have shared counterparts, those - in static form only remain available as usual (saves around 6MB) -- remove "la" files - -------------------------------------------------------------------- -Wed Jan 7 12:34:56 CET 2009 - olh@suse.de - -- obsolete old -XXbit packages (bnc#437293) - -------------------------------------------------------------------- -Thu Oct 23 18:24:37 CEST 2008 - mmarek@suse.cz - -- fix mysql_install_db when the hostname is 'localhost' - (bnc#429618, mysql#35754) - -------------------------------------------------------------------- -Thu Sep 25 16:45:53 CEST 2008 - mmarek@suse.cz - -- build -max and -debug with --with-big-tables and archive, csv, - example, blackhole and federated engines to match the binary - builds provided by MySQL (bnc#427384) - -------------------------------------------------------------------- -Fri Sep 12 18:33:47 CEST 2008 - mmarek@suse.cz - -- better fix for CVE-2008-2079 (bnc#425079, mysql#32167) - -------------------------------------------------------------------- -Fri Sep 12 15:37:25 CEST 2008 - mmarek@suse.de - -- remove no longer needed s390 workaround - -------------------------------------------------------------------- -Tue Sep 2 11:08:38 CEST 2008 - mmarek@suse.cz - -- fix mysql_config --libs output (bnc#420313, mysql#39175) - -------------------------------------------------------------------- -Mon Aug 25 10:04:20 CEST 2008 - mmarek@suse.cz - -- updated to 5.0.67, for changes see - http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-67.html - - -------------------------------------------------------------------- -Mon Aug 18 15:48:07 CEST 2008 - mmarek@suse.de - -- add Required-Stop: $network $remote_fs to the init script - -------------------------------------------------------------------- -Fri May 30 15:35:17 CEST 2008 - mmarek@suse.cz - -- fix a race in rcmysql restart between the old mysql removing it's - pid file and exiting - use checkproc -p (bnc#359522, bnc#332530, - #395710) - -------------------------------------------------------------------- -Thu May 22 22:02:23 CEST 2008 - mmarek@suse.cz - -- increase timeout in rcmysql stop, should fix failed restarts - (bnc#359522, bnc#332530) - -------------------------------------------------------------------- -Mon May 19 15:02:38 CEST 2008 - mmarek@suse.cz - -- fixed a privilege bypass with DATA/INDEX DIRECTORY - (bnc#387746, mysql#32167, CVE-2008-2079) - -------------------------------------------------------------------- -Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de - -- added baselibs.conf file to build xxbit packages - for multilib support - -------------------------------------------------------------------- -Fri Mar 14 14:19:36 CET 2008 - mmarek@suse.cz - -- fixed mysqld_multi.patch (bnc#371000) - -------------------------------------------------------------------- -Fri Mar 14 13:31:01 CET 2008 - mmarek@suse.cz - -- add 'user = mysql' to mysqld_multi example groups - -------------------------------------------------------------------- -Fri Mar 14 09:21:41 CET 2008 - mmarek@suse.cz - -- synced with server:database:mysql51 -- dropped README.SUSE (bnc#357634) -- moved mysql_upgrade to the server package (bnc#366820) -- adjusted license tags -- finally convert err-log to log-error in my.cnf -- Added multi database support by - o updating /etc/init.d/mysql, it has now 2 legs the existing one to start - a single database, and a new one to start and stop multiple database. - o Added a sysconfig variable - o Updated /etc/my.cnf with some examples database configurations - (Done by Richard Bos, minor edits by me, bnc#353120) - - -------------------------------------------------------------------- -Tue Feb 26 13:50:00 CET 2008 - mmarek@suse.cz - -- updated to 5.0.51a - * incorporates previous security fixes - -------------------------------------------------------------------- -Fri Jan 4 15:25:50 CET 2008 - mmarek@suse.cz - -- updated to 5.0.51 - * statements that contain unclosed /*-comments now are rejected - with a syntax error [mysql#28779] - * server parser performance improvements [mysql#30625, - mysql#30237] - * security fix: CVE-2007-5969 / mysql#32111 - * for a full list of changes, see - http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-51.html -- fixed CVE-2007-6303 / mysql#29908 -- fixed CVE-2007-6304 / mysql#29801 -- fixed several testsuite failures - (mybug25359.patch, mybug32458.patch, mybug33050.patch) - -------------------------------------------------------------------- -Wed Dec 26 07:45:12 CET 2007 - crrodriguez@suse.de - -- fix library-without-ldconfig-postun - -------------------------------------------------------------------- -Thu Nov 8 13:39:51 CET 2007 - mmarek@suse.cz - -- avoid using distributed pregenerated files instead of - files generated in the builddirs - -------------------------------------------------------------------- -Fri Aug 31 13:46:48 CEST 2007 - mmarek@suse.cz - -- make sure mysql-shared is replaced by libmysqlclient15 when - updating from 10.1 or 10.2 [#306556] - -------------------------------------------------------------------- -Wed Aug 29 17:55:40 CEST 2007 - mmarek@suse.cz - -- fix for http://bugs.mysql.com/30069 - (thanks to Richard Guenther) - -------------------------------------------------------------------- -Tue Aug 21 10:21:49 CEST 2007 - mmarek@suse.cz - -- make TMPDIR relative to datadir= setting in /etc/my.cnf -- add a hint about changing datadir to rcmysql [#285076] - -------------------------------------------------------------------- -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 - -------------------------------------------------------------------- -Mon Jul 2 10:58:59 CEST 2007 - mmarek@suse.cz - -- mysql_upgrade: don't fail if the db is already up-to-date - [#287209] (mysql_upgrade-exit-status.patch) - -------------------------------------------------------------------- -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 - -------------------------------------------------------------------- -Fri Jun 1 09:15:49 CEST 2007 - mmarek@suse.cz - -- fixed build for older distributions in the buildservice - -------------------------------------------------------------------- -Tue May 29 12:58:35 CEST 2007 - mmarek@suse.de - -- run ldconfig in %%post of library packages -- don't copy example my.cnf files to /usr/share/doc (they're - already installed in /usr/share/mysql -- fixed libmysqlclient-devel dependencies - -------------------------------------------------------------------- -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] - -------------------------------------------------------------------- -Thu Mar 29 10:58:14 CEST 2007 - mmarek@suse.de - -- BuildRequires fixes: - + ncurses-devel - + zlib-devel - + procps (configure needs /bin/ps) - + pwdutils (to be able to install the package in the build root) - + use sed instead of ex in the s390 workaround -- build with -DFORCE_INIT_OF_VARS to get rid of some uninitialized - variable warnings - -------------------------------------------------------------------- -Mon Mar 12 10:16:55 CET 2007 - mmarek@suse.cz - -- added openssl-devel to Requires: of mysql-devel to fix build of - packages using mysql-devel - -------------------------------------------------------------------- -Thu Feb 22 17:20:33 CET 2007 - mmarek@suse.cz - -- updated to 5.0.33, see - http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-33.html - for a list of changes -- added SuSEfirewall2 description file [#246917] -- print a friendly message about "Duplicate column" errors in - mysql_upgrade - [#228248] (mysql_upgrade.patch) -- fixed a typo in /etc/logrotate/mysql [#244620] -- build the client, libraries and the Max server with OpenSSL - support (FIXME: not yet tested, there are some failures in the - testsuite) -- don't package the PDF manual (it's constantly out of date and it - might make more sense to create a noarch mysql-manual.rpm or just - point users to http://dev.mysql.com/doc/ instead) -- don't link libmysql to the various client binaries statically -- created a new mysql-tools subpackage with scripts / binaries - that aren't essential for the client and server packages and - bring additional deps (perl-DBD-mysql namely) -- use VPATH builds for building the different server versions for - easier debugging (no 'make clean' in-between) -- build the client and libraries only once to save build time - (mysql-build-only-server.patch) -- cleaned up spec file - -------------------------------------------------------------------- -Mon Jan 22 15:18:36 CET 2007 - mmarek@suse.cz - -- silence some gcc warnings (compiler-warnings.patch) - -------------------------------------------------------------------- -Wed Jan 3 12:09:38 CET 2007 - mmarek@suse.cz - -- mysql-devel doesn't need mysql-client [#231010] - -------------------------------------------------------------------- -Tue Dec 19 11:54:45 CET 2006 - mmarek@suse.cz - -- updated to 5.0.27 - * includes the fix for http://bugs.mysql.com/bug.php?id=23427 -- fixed build with tar-1.16 -- fixed small typo in README.SuSE, renamed to README.SUSE [#226716] - -------------------------------------------------------------------- -Thu Nov 23 11:28:15 CET 2006 - mmarek@suse.de - -- don't run killproc in rcmysql to avoid sending SIGKILL if - possible [#223209] - -------------------------------------------------------------------- -Wed Nov 15 17:16:46 CET 2006 - mmarek@suse.de - -- create user mysql with shell /bin/false, because 'su mysql' is - not needed anymore (see bug #57071) - -------------------------------------------------------------------- -Wed Nov 15 12:30:43 CET 2006 - mmarek@suse.cz - -- use /var/lib/mysql/.tmp instead of /var/lib/mysql/tmp to avoid - collision with a database named 'tmp' [#221188] - -------------------------------------------------------------------- -Tue Nov 14 12:10:16 CET 2006 - mmarek@suse.cz - -- use upstream patch for the varbinary upgrade problem (fixes the - problem in the REPAIR TABLE implementation, not in the mysqlcheck - program) - [#188134, http://bugs.mysql.com/bug.php?id=19371] - -------------------------------------------------------------------- -Tue Oct 31 16:56:24 CET 2006 - mmarek@suse.cz - -- fixed another binary incompatibility in mysql-shared - [http://bugs.mysql.com/bug.php?id=23427] (mybug23427.patch) - -------------------------------------------------------------------- -Thu Oct 19 16:02:59 CEST 2006 - pnemec@suse.cz - -- updated to 5.0.26 - * fixes security bugs CVE-2006-4226 and CVE-2006-4227 - * Ctrl-C in the mysql CLI client tries to kill the current - statement first, instead of exiting - * mysqlshow treats wild characters such as '_' as literal, if the - argument matches a single database name exactly - * DROP VIEW with multiple views will try to drop remaining views - and not stop at first error - * the server now issues a warning if it removes leading spaces - from an alias - * the VIEW_DEFINITION column of the INFORMATION_SCHEMA VIEWS - table now contains information about the view algorithm - * mysql_upgrade doesn't read the [client] section of my.cnf, only - the [mysql_upgrade] section - * the LOAD DATA FROM MASTER and LOAD TABLE FROM MASTER statements - are deprecated, see - http://dev.mysql.com/doc/refman/5.0/en/load-data-from-master.html - * mysqldump now has a --flush-privileges option. It causes - mysqldump to emit a FLUSH PRIVILEGES statement after dumping - the mysql database - * lots of bugfixes -- new patch uninitialized_variable.patch - -------------------------------------------------------------------- -Mon Oct 16 10:37:29 CEST 2006 - mmarek@suse.cz - -- The ISAM storage engine is no longer supported, update the - warning in rc.mysql. - -------------------------------------------------------------------- -Mon Oct 2 13:17:19 CEST 2006 - mmarek@suse.cz - -- updated to version 5.0.24a - * fixes a binary incompatibility of mysql-shared introduced in - 5.0.24 - * fixes a buffer overflow caused by statements with long DEFINER - clause - * fixes crash when closing temporary tables - -------------------------------------------------------------------- -Mon Sep 11 19:45:32 CEST 2006 - joeshaw@suse.de - -- Add the libmysqld static libraries to the devel package. - -------------------------------------------------------------------- -Wed Aug 16 16:17:39 CEST 2006 - mmarek@suse.cz - -- updated to version 5.0.24 - * added the --ssl-verify-server-cert option to MySQL client - programs and MYSQL_OPT_SSL_VERIFY_SERVER_CERT for - mysql_options() - * new ssl_ca, ssl_capath, ssl_cert, ssl_cipher, and ssl_key - system variables - * added --skip-merge option to disable the MERGE storage engine, - because it has a minor security problem - [http://bugs.mysql.com/20230] - * mysql_upgrade script reimplemented in C - * bug fixes -- dropped obsolete CVE-2006-0903.patch and pick_args.patch, - added my_libwrap.patch [http://bugs.mysql.com/18246] - -------------------------------------------------------------------- -Tue Aug 1 16:46:22 CEST 2006 - mmarek@suse.cz - -- removed Recommends: from mysql-debug, it doesn't work on older - dists - -------------------------------------------------------------------- -Mon Jul 31 16:14:05 CEST 2006 - mmarek@suse.cz - -- created a new mysql-debug package compiled with --with-debug - and removed the --with debug rpmbuild option -- fixed --core-file option to really work when the server is - started by root - (coredump.patch) [http://bugs.mysql.com/bug.php?id=21361] -- added a README.debug describing how to debug mysqld crashes -- cleaned up rc.mysql a bit -- the server depends on a minimal mysql-client version to make - sure a recent mysqlcheck is available for rc.mysql - -------------------------------------------------------------------- -Mon Jul 31 10:03:39 CEST 2006 - mmarek@suse.cz - -- fixed some leaks and overflos in varbinary-upgrade.patch - -------------------------------------------------------------------- -Fri Jul 21 10:28:09 CEST 2006 - mmarek@suse.cz - -- workaround an incompatibility with pre-5.0 varbinary fields: - update the .frm file and remove trailing zeros and spaces - in 'mysqlcheck --check-upgrade' - [#188134, http://bugs.mysql.com/bug.php?id=19371] - (varbinary-upgrade.patch) - -------------------------------------------------------------------- -Fri Jun 30 15:17:39 CEST 2006 - mmarek@suse.cz - -- use --skip-networking when running the server with - --skip-grant-tables in rcmysql (problem reported by Lenz Grimmer) - -------------------------------------------------------------------- -Mon Jun 19 10:48:57 CEST 2006 - mmarek@suse.cz - -- updated to 5.0.22 - * new mysql_upgrade script for easies upgrades from previous - versions - * libmysqlclient.so uses versioned symbols - * new 'charset' command in the mysql client to switch charsets - without reconnecting - * lots of bugfixes -- modified rcmysql to use the mysql_upgrade script -- the testsuite can be run in %%build again (run - rpmbuild --with testsuite ... mysql.spec) -- dropped patches: lib64.patch, sql_parse.patch - -------------------------------------------------------------------- -Thu Jun 1 14:32:13 CEST 2006 - mmarek@suse.cz - -- build as user - -------------------------------------------------------------------- -Wed May 3 13:59:11 CEST 2006 - mmarek@suse.cz - -- fix buffer overflow and and reading uninitialized memory using - the COM_TABLE_DUMP protocol command (fix from the 5.0.21 release) - [#172155] (sql_parse.patch) - -------------------------------------------------------------------- -Tue Apr 4 13:58:58 CEST 2006 - mmarek@suse.cz - -- don't allow \0 in SQL even in comments - [#163157] (CVE-2006-0903.patch) - -------------------------------------------------------------------- -Mon Mar 27 13:54:20 CEST 2006 - mmarek@suse.cz - -- require mysql-shared = %%version in mysql-devel - -------------------------------------------------------------------- -Tue Mar 7 11:14:53 CET 2006 - mmarek@suse.cz - -- mail error message and explanation in logrotote script - [#155341] (logrotate.patch) - -------------------------------------------------------------------- -Mon Mar 6 12:45:30 CET 2006 - mmarek@suse.cz - -- make err-log option work again -- put a symlink to the logfile into /var/log - [#155341] (4x-compat.patch) - -------------------------------------------------------------------- -Tue Jan 31 18:23:44 CET 2006 - mmarek@suse.cz - -- run mysql_fix_privilege_tables.sql when upgrading from 4.1 - [#146739] - -------------------------------------------------------------------- -Wed Jan 25 21:38:29 CET 2006 - mls@suse.de - -- converted neededforbuild to BuildRequires - -------------------------------------------------------------------- -Tue Jan 10 14:49:32 CET 2006 - mmarek@suse.cz - -- created a new package mysql-test -- removed unnecessary %%suse_update_config - -------------------------------------------------------------------- -Mon Jan 2 13:32:53 CET 2006 - mmarek@suse.cz - -- update to 5.0.18 - -------------------------------------------------------------------- -Tue Dec 6 09:36:35 CET 2005 - mmarek@suse.cz - -- update to 5.0.16 - -------------------------------------------------------------------- -Thu Dec 1 10:54:15 CET 2005 - mmarek@suse.cz - -- try postadal's update in BETA - -------------------------------------------------------------------- -Tue Oct 25 20:28:02 CEST 2005 - postadal@suse.cz - -- updated to version 5.0.15 [#119929] -- removed obsoleted buffer-overflow.patch -- fixed gcc issue - -------------------------------------------------------------------- -Thu Sep 1 12:19:57 CEST 2005 - pnemec@suse.cz - -- fixed bug #95729 : set $TMPDIR to /var/lib/mysql/tmp - -------------------------------------------------------------------- -Tue Aug 30 17:59:08 CEST 2005 - lmuelle@suse.de - -- Use MySQL for any output of the init script and add a space at each line we - output. - -------------------------------------------------------------------- -Tue Jul 26 18:30:33 CEST 2005 - postadal@suse.cz - -- updated to version 4.1.13 -- removed obsoleted sentinel.patch -- added glibc-devel zlib-devel to devel requires - -------------------------------------------------------------------- -Fri May 20 15:56:01 CEST 2005 - mcihar@suse.cz - -- update to 4.1.12 (fixes tmp race, bug #84740) - -------------------------------------------------------------------- -Fri Apr 22 15:54:17 CEST 2005 - mcihar@suse.cz - -- fix buffer overflow in test - -------------------------------------------------------------------- -Thu Apr 21 08:37:42 CEST 2005 - tcrhak@suse.de - -- use $datadir when initializing a new database (bug #63707) - -------------------------------------------------------------------- -Wed Apr 6 12:20:11 CEST 2005 - mcihar@suse.cz - -- update to 4.1.11 -- compile against readline (bug #75901) - -------------------------------------------------------------------- -Sun Apr 3 12:43:10 CEST 2005 - aj@suse.de - -- Fix GCC 4 warning. - -------------------------------------------------------------------- -Fri Apr 1 14:39:04 CEST 2005 - mcihar@suse.cz - -- enable ISAM engine (bug #75320) -- warn about existing ISAM tables (bug #75320) -- fix init script to update MySQL tables on upgrade (bug #75321) - -------------------------------------------------------------------- -Thu Mar 10 11:33:17 CET 2005 - mcihar@suse.cz - -- update to 4.1.10a (bug #71788) - -------------------------------------------------------------------- -Tue Feb 15 14:25:12 CET 2005 - mcihar@suse.cz - -- update to 4.1.10 (bug #50825) - -------------------------------------------------------------------- -Thu Feb 10 15:08:33 CET 2005 - mcihar@suse.cz - -- disable actually test also for second build - -------------------------------------------------------------------- -Tue Feb 8 15:25:50 CET 2005 - mcihar@suse.cz - -- remove tests at all, these timeout in autobuild and work okay when - building manyally - -------------------------------------------------------------------- -Fri Feb 4 17:40:44 CET 2005 - mcihar@suse.cz - -- increase test timeout not to fail so often - -------------------------------------------------------------------- -Mon Jan 24 18:46:30 CET 2005 - mcihar@suse.cz - -- update to 4.1.9 -- normal version now also supports InnoDB as well as original MySQL packages -- update mysql tables on server start if needed - -------------------------------------------------------------------- -Fri Sep 17 16:32:32 CEST 2004 - ro@suse.de - -- added symlinks for libmysqlclient_r also in libdir/mysql - -------------------------------------------------------------------- -Fri Sep 17 14:00:23 CEST 2004 - tcrhak@suse.cz - -- added symlink libmysqlclient_r.so -> libmysqlclient_r.so.12.0.0 - to the file list of mysql-devel (bug #44700) - -------------------------------------------------------------------- -Fri Sep 10 16:41:04 CEST 2004 - tcrhak@suse.cz - -- update to 4.0.21 - -------------------------------------------------------------------- -Thu Sep 02 10:50:22 CEST 2004 - tcrhak@suse.cz - -- do not use /var/adm/notify for notification mails (bug #44357) -- updated README.SuSE (bug #44332) -- be more verbose in the initial welcome message of mysql_install_db - (also bug #44332) - -------------------------------------------------------------------- -Thu Aug 19 13:35:09 CEST 2004 - tcrhak@suse.cz - -- update to version 4.0.20 -- use group 'mysql' instead of 'daemon' for mysqld (bug #42071) -- fixed a lib64 issue in mysql_config -- applied patch for a security hole in mysqlhotcopy (bug #43829) -- fixed a typo in rcmysql (bug #41055) -- fix in order not to use initgroups() (caused segfault when used - with ldap, bug #39798) - -------------------------------------------------------------------- -Fri Apr 02 14:07:42 CEST 2004 - tcrhak@suse.cz - -- fixed tmp race in mysqlbug (bug #37115) - -------------------------------------------------------------------- -Wed Mar 31 11:39:54 CEST 2004 - tcrhak@suse.cz - -- mysql: added dependency on perl-DBD-mysql (bug #36500) -- fixed timezone.test (patch timezone) - -------------------------------------------------------------------- -Sat Mar 27 19:09:25 CET 2004 - ro@suse.de - -- mysql-bench: replace perl-Msql-Mysql-modules by perl-DBD-mysql - in requires - -------------------------------------------------------------------- -Wed Mar 17 16:38:21 CET 2004 - tcrhak@suse.cz - -- use -f when running hostname in mysql_install_db (bug #36060) - -------------------------------------------------------------------- -Fri Feb 20 10:42:00 CET 2004 - tcrhak@suse.cz - -- added /usr/bin/myisam_ftdump to filelist -- updated manual.pdf to the latest version (2004-02-20) - -------------------------------------------------------------------- -Wed Feb 18 13:00:25 CET 2004 - tcrhak@suse.cz - -- update to version 4.0.18 - -------------------------------------------------------------------- -Fri Feb 6 11:05:40 CET 2004 - kukuk@suse.de - -- Compile with -fno-strict-aliasing - -------------------------------------------------------------------- -Wed Oct 29 17:18:33 CET 2003 - tcrhak@suse.cz - -- use socket to detect the start of mysqld instead - of 'mysqladmin ping' again [bug #31605] - -------------------------------------------------------------------- -Tue Sep 16 12:47:18 CEST 2003 - tcrhak@suse.cz - -- fixed the postrotate script [bug #30985] - -------------------------------------------------------------------- -Mon Sep 15 20:25:10 CEST 2003 - tcrhak@suse.cz - -- fixed bogus 'start failed' reporting [bug #30210] - -------------------------------------------------------------------- -Thu Sep 11 14:43:19 CEST 2003 - tcrhak@suse.cz - -- update to version 4.0.15 - -------------------------------------------------------------------- -Thu Aug 28 13:05:51 CEST 2003 - meissner@suse.de - -- Readded ppc/ppc64 mutex patch. - -------------------------------------------------------------------- -Mon Aug 25 09:09:01 CEST 2003 - tcrhak@suse.cz - -- updated to version 4.0.14 -- added patch overflow -- added macros %stop_on_removal and %restart_on_update -- updated the pdf manual to version 2003-08-22 - -------------------------------------------------------------------- -Fri May 30 16:22:59 CEST 2003 - tcrhak@suse.cz - -- fixed installed unpacked files - -------------------------------------------------------------------- -Fri May 16 18:29:57 CEST 2003 - tcrhak@suse.cz - -- update to version 4.0.12 -- require mysql-client in the main package (needed for logrotate) -- use mysqladmin ping in logrotate script -- commented out log_bin in my.cnf (my-medium.cnf) (bug #26716) - -------------------------------------------------------------------- -Thu Apr 24 12:20:23 CEST 2003 - ro@suse.de - -- fix install_info --delete call and move from preun to postun - -------------------------------------------------------------------- -Fri Mar 7 12:13:25 CET 2003 - kukuk@suse.de - -- Fix useradd options - -------------------------------------------------------------------- -Sun Feb 23 11:05:06 CET 2003 - tcrhak@suse.cz - -- added %fillup_prereq and %insserv_prereq [bug #24039] - -------------------------------------------------------------------- -Fri Feb 14 12:31:40 CET 2003 - tcrhak@suse.cz - -- updated to version 3.23.55 -- updated the pdf manual to version 2002-07-26 -- fixed script mysql_install_db to use mysql-max if present - ( necessary if e.g. options concerning innodb are - uncommented prior to starting mysqld ) -- on start-up, detach from the terminal [bug #18440] -- added %install_info macros - -------------------------------------------------------------------- -Fri Jan 17 13:14:25 CET 2003 - bg@suse.de - -- Disabled berkeley db backend for hppa - -------------------------------------------------------------------- -Mon Dec 2 14:49:52 CET 2002 - ro@suse.de - -- include errno.h - -------------------------------------------------------------------- -Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de - -- removed bogus self-provides - -------------------------------------------------------------------- -Sat Aug 24 16:09:52 CEST 2002 - kukuk@suse.de - -- Disabled berkeley db backend for SPARC - -------------------------------------------------------------------- -Mon Aug 19 18:55:07 CEST 2002 - bk@suse.de - -- Update to 3.23.52, which is a bugfix release for 3.23.51. Fixes (trimmed): - o Fixed security bug when having an empty database name in the user.db table. - o Changed initialisation of RND() to make it less predicatable. - o Fixed GROUP BY on result with expression that created a BLOB field. - o Fixed thread bug in SLAVE START, SLAVE STOP and automatic repair of MyISAM - tables that could cause table cache to be corrupted. - o Fixed possible thread related key-cache-corruption problem with OPTIMIZE - TABLE and REPAIR TABLE. - o Fixed bug with creating an auto-increment value on second part of a UNIQUE() - key where first part could contain NULL values. - o Don't write slave-timeout reconnects to the error log. - o Fixed bug with slave net read timeouting - o Fixed a core-dump bug with MERGE tables and MAX() function. - o Fixed bug in ALTER TABLE with BDB tables. - o Fixed bug when logging LOAD DATA INFILE to binary log with no active database. - o Fixed a bug in range optimiser (causing crashes). - o Fixed possible problem in replication when doing DROP DATABASE on a database - with InnoDB tables. -- add fileutils to PreReq and use echo instead of cat. - -------------------------------------------------------------------- -Mon Aug 12 14:22:35 CEST 2002 - max@suse.de - -- Using pthread mutexes instead of atomic_* on s390 and s390x, - because mysql casts &int to (atomic_t *) when calling the atomic - functions which breaks the alignment constraints of atomic_t. - -------------------------------------------------------------------- -Tue Jul 23 20:33:25 CEST 2002 - kukuk@suse.de - -- Fix useradd call - -------------------------------------------------------------------- -Mon Jul 22 10:51:28 CEST 2002 - kukuk@suse.de - -- Create user mysql - -------------------------------------------------------------------- -Mon Jul 22 09:57:30 CEST 2002 - max@suse.de - -- New version: 3.23.51. -- Init script doesn't source /etc/rc.config anymore [#17122]. -- Disabled berkeley db backend for alpha and x86_64 as well. -- Still breaks on s390x, and x86_64. - -------------------------------------------------------------------- -Fri Jun 14 16:43:46 CEST 2002 - meissner@suse.de - -- Reenabled make test. -- Rerun auto* tools so libtool works on ppc64. -- Do not use the berkeley DB backend on s390,s390x,ppc,ppc64,axp,mips - (needs to be fixed some time) -- Use generic AC_SYS_LARGEFILE macro. -- Do not use asm/atomic stuff on ppc64 (long vs int problem). -- Use CONFIG_SMP for other asm/atomic stuff instead of __SMP__. - -------------------------------------------------------------------- -Mon May 27 12:11:31 CEST 2002 - meissner@suse.de - -- Disabled make test for x86_64 for now. -- More %_lib fixes, packaged libmysqlclient.so symlink into devel, the - rest *.so.* into shared. - -------------------------------------------------------------------- -Wed Apr 24 12:57:49 CEST 2002 - meissner@suse.de - -- started x86_64 work. Implemented required fast mutex, - now only the test suite fail. - -------------------------------------------------------------------- -Fri Feb 15 16:07:35 CET 2002 - grimmer@suse.de - -- Update to 3.23.48 (bugfixes) - MySQL 3.23 is now considered - STABLE! - * Fixed bug in complicated join with const tables - * Added internal safety checks for InnoDB - * SHOW GRANTS now shows REFERENCES instead of REFERENCE -- use more libdir macros -- safe_mysqld logfile has been renamed from - /var/lib/mysql/.log to /var/lib/mysql/mysqld.log and - is properly rotated by logrotate -- updated README.SuSE - -------------------------------------------------------------------- -Wed Jan 30 17:10:08 CET 2002 - grimmer@suse.de - -- Update to 3.23.47 (bugfixes) - see the following URLs for the - full list of changes: - http://www.mysql.com/doc/N/e/News-3.23.47.html -- re-enabled and adjusted inline-patch -- use libdir and prefix macros in configure call - -------------------------------------------------------------------- -Thu Dec 20 13:38:29 CET 2001 - grimmer@suse.de - -- added /etc/logrotate.d/mysql -- added log-rotate.patch to fit SuSEs logrotating better -- added debugging symbols and /usr/bin/resolve_stack_dump -- reworked installation section in spec file (create all - directories first) - -------------------------------------------------------------------- -Mon Dec 17 10:20:38 CET 2001 - grimmer@suse.de - -- Update to 3.23.46 (bugfixes) - see the following URLs for the - full list of changes: - http://www.mysql.com/doc/N/e/News-3.23.45.html - http://www.mysql.com/doc/N/e/News-3.23.46.html -- Changed ldflags from "all-static" to "static" and make sure - to archive *.lai files as well before recompiling (required - to build Midgard), thanks to schwab@suse.de for the patch -- changed mysql-shared file list from /usr/lib/libmysqlclient.so* - to /usr/lib/libmysqlclient.so.* -- removed START_MYSQL rc.config entry for SuSE Linux 8.0, adapted - spec file to reflect this change -- updated README.SuSE - -------------------------------------------------------------------- -Wed Nov 21 21:52:49 CET 2001 - grimmer@suse.de - -- added check for "socket=" variable in function "parse_arguments" - in the mysql init script (thanks to Aivo Kalu and Peter Marschall - for spotting this) - the init script would issue a "failed" - notice, if the socket variable had been changed to a different - path than /var/lib/mysql/mysql.sock in /etc/my.cnf even though - the MySQL daemon would be up and running [#12411] - -------------------------------------------------------------------- -Thu Nov 15 21:35:23 CET 2001 - grimmer@suse.de - -- Update to 3.23.44 (bugfixes) - see the following URLs for the - full list of changes: - http://www.mysql.com/doc/N/e/News-3.23.43.html - http://www.mysql.com/doc/N/e/News-3.23.44.html -- added "-felide-constructors -fno-exceptions -fno-rtti" to - CXXFLAGS in spec file (thanks to Monty Widenius for pointing - this out) -- Updated manual.pdf -- disabled inline patch (not required anymore) -- Install /etc/mysqlaccess.conf with permissions set to "640" - instead of "755" [#10871] - -------------------------------------------------------------------- -Mon Oct 1 11:23:10 CEST 2001 - schwab@suse.de - -- Add patch to allow compilation even if the compiler decides to - not actually inline the two largest inline functions, - page_dir_slot_check() and btr_search_check_guess(). -- Don't run automake, fix the extra dependency instead. - -------------------------------------------------------------------- -Mon Sep 17 15:29:30 CEST 2001 - grimmer@suse.de - -- Update to 3.23.42 (bugfixes) - the following bugs were fixed: - * Fixed problem when using LOCK TABLES and BDB tables. - * Fixed problem with REPAIR TABLE on MyISAM tables with row - lengths between 65517 - 65520 bytes - * Fixed rare hang when doing mysqladmin shutdown when there - was a lot of activity in other threads. - * Fixed problem with INSERT DELAYED where delay thread could - be hanging on upgrading locks without any apparent reasons. - * Fixed problem with myisampack and BLOB. - * Fixes problem when one edited .MRG tables by hand. (Patch - from Benjamin Pflugmann). - * Enforce that all tables in a MERGE table come from the same - database. - * Fixed bug with LOAD DATA INFILE and transactional tables. - * Fix bug when using INSERT DELAYED with wrong column definition. - * Fixed coredump during REPAIR of some particularly broken tables. - * Fixed bug in InnoDB and AUTO_INCREMENT columns. - * Fixed bug in InnoDB and RENAME TABLE columns. - * Fixed critical bug in InnoDB and BLOB columns. If one has used - BLOB columns larger than 8000 bytes in an InnoDB table, one - must dump the table with mysqldump, drop it and restore it - from the dump. - * Applied large patch for OS/2 from Yuri Dario. - * Fixed problem with InnoDB when one could get the error - Can't execute the given command... even when one didn't have - an active transaction. - * Applied some minor fixes that concern Gemini. - * Use real arithmetic operations even in integer context if not - all arguments are integers. (Fixes uncommon bug in some integer - contexts). - * Don't force everything to lower cases on Windows. (To fix - problem with Windows and ALTER TABLE). Now --lower_case_names - also works on Unix. - * Fixed that automatic rollback that is done when thread end - doesn't lock other threads. - -------------------------------------------------------------------- -Tue Aug 14 14:11:40 CEST 2001 - grimmer@suse.de - -- Update to 3.23.41 (bugfixes, see the changelog at - http://www.mysql.com/doc/N/e/News-3.23.41.html for details) - -------------------------------------------------------------------- -Mon Jul 30 14:15:29 CEST 2001 - grimmer@suse.de - -- Update to 3.23.40 (see the changelogs at - http://www.mysql.com/doc/N/e/News-3.23.x.html for details) -- spec file: added mysql-Max subpackage that includes all the - new bells and whistles (BerkeleyDB, InnoDB) -- spec file: added "--with-libwrap" compile option to enable - TCP wrapper support -- spec file: reworked the build and install section to ease - the creation of mysqld-max -- rc.mysql: fixed two (trivial) typos -- rc.mysql: make sure to test for mysqld-max as well before - trying to start up -- spec file: moved "replace" and "perror" binaries incl. - man pages to the mysql-client package -- spec file: corrected URLs -- manual.pdf: update to current version -- README.SuSE: updated to document the above changes - -------------------------------------------------------------------- -Fri May 4 20:35:32 CEST 2001 - grimmer@suse.de - -- Fixed a nasty bug when updating after the database files - have been copied to the new location, but the old ones have - not been removed (#7692) - thanks to Jochen Schulz - for spotting this one. - -------------------------------------------------------------------- -Sat Apr 28 19:03:03 CEST 2001 - grimmer@suse.de - -- Update to 3.23.37 (bugfixes, see - http://www.mysql.com/doc/N/e/News-3.23.37.html for full - changelog) -- fixed init script, now start MySQL using the wrapper script - "safe_mysqld" instead of mysqld again (logging did not work), - fixes for bug [#6876] and [#6840] -- we currently do not enable MySQL-Max, since it is still - considered beta (http://www.mysql.com/downloads/mysql-max-3.23.html) - -------------------------------------------------------------------- -Thu Apr 12 14:35:13 CEST 2001 - grimmer@suse.de - -- Update to 3.23.36 (bugfix and security release) - full Changelogs for Changes between 3.23.33 and 3.23.36 are here: - http://www.mysql.com/doc/N/e/News-3.23.36.html - http://www.mysql.com/doc/N/e/News-3.23.35.html - http://www.mysql.com/doc/N/e/News-3.23.34.html -- reworked init script -- added more man pages to file list -- reworked README.SuSE -- added automated testing to spec file - -------------------------------------------------------------------- -Thu Mar 8 09:39:38 CET 2001 - grimmer@suse.de - -- Update to 3.23.33 (bugfix release, see - http://www.mysql.com/doc/N/e/News-3.23.33.html for a complete - list of changes) -- updated manual.pdf -- fixed init script (#6044, "failed" on startup on a 2.4 kernel) - beautified init script output a bit, changed "reload" argument - to "force-reload" and added separate "reload" section -- added some comments about replication and BerkeleyDB code to - README.SuSE -- marked init script as config file in spec file - -------------------------------------------------------------------- -Tue Jan 23 10:30:18 CET 2001 - grimmer@suse.de - -- Update to 3.23.32 - stable release including security fixes - for the SHOW GRANTS statement and a remote buffer overflow - (Bugtraq ID 2262) -- updated manual.pdf -- added some missing files to the file list -- added --without-berkeley-db to the configure options - (according to the release notes, Berkeley DB support and - replication have not been exhaustively tested yet) - -------------------------------------------------------------------- -Wed Jan 10 12:51:02 CET 2001 - grimmer@suse.de - -- Update to 3.23.30-gamma (bugfix-release) -- added manual.pdf as a separate file -- removed verbosity flag from cp-command in preinstall section - -------------------------------------------------------------------- -Fri Dec 22 19:32:57 CET 2000 - grimmer@suse.de - -- fixed initial startup in init script (correct ownerships of - the mysql datadir before starting mysqld using "chown") -- added different mysql sample configurations to directory "cnf" - in the documentation directory -- use my-medium.cnf as default configuration /etc/my.cnf - -------------------------------------------------------------------- -Mon Dec 18 12:19:39 CET 2000 - grimmer@suse.de - -- fixed packaging of mysql-bench (file list was empty) - -------------------------------------------------------------------- -Fri Dec 15 13:29:16 CET 2000 - grimmer@suse.de - -- init script fixes (added $remote_fs to Required-Start, - check if /usr/sbin/mysqld exists) -- README.SuSE updates - -------------------------------------------------------------------- -Fri Dec 1 13:20:12 CET 2000 - ro@suse.de - -- added static libs to devel package - -------------------------------------------------------------------- -Mon Nov 27 15:25:54 CET 2000 - grimmer@suse.de - -- update to 3.23.28-gamma (considered stable enough by Monty) -- added --with-extra-charsets=complex -- database files are now located below /var/lib/mysql -- do not use --with-raid or --with-berkeley-db yet -- adapted to new init scheme (new init script, removed symlinks, - moved init script from /sbin/init.d -> /etc/init.d) -- moved socket from /tmp/mysql.sock to /var/lib/mysql/mysql.sock -- removed AGREEMENT since mysql is GPL now -- removed README.SuSE, rc.config.mysql and rc.mysql from patch - and added them as additional source files instead - -------------------------------------------------------------------- -Fri Nov 10 17:25:51 CET 2000 - grimmer@suse.de - -- added a symlink /usr/lib/mysql/libmysqlclient.so -> - ../libmysqlclient.so.6.0.0 to make libtool happy - -------------------------------------------------------------------- -Mon Nov 6 09:24:10 CET 2000 - grimmer@suse.de - -- fixed Requires: for mysql-bench (mysql-perl -> perl-Msql-Mysql-modules) - -------------------------------------------------------------------- -Thu Nov 2 17:24:47 CET 2000 - grimmer@suse.de - -- switched to long package names: - mysqclnt -> mysql-client - mysqldev -> mysql-devel - mysqbnch -> mysql-bench - mysqllib -> mysql-shared -- removed subpackage mysqperl from mysql.spec and created - separate packages (perl-Msql-Mysql-modules and perl-Data-ShowTable) -- finally use BuildRoot -- updated README.SuSE to reflect changes - -------------------------------------------------------------------- -Wed Aug 23 00:07:55 CEST 2000 - ro@suse.de - -- fixed perl path - -------------------------------------------------------------------- -Fri Jul 21 16:52:02 CEST 2000 - grimmer@suse.de - -- corrected removal of comment - bash does not like - empty if-statements... - -------------------------------------------------------------------- -Thu Jul 13 18:43:17 CEST 2000 - grimmer@suse.de - -- added missing "-" to parameter "hostname --fqdn" in - scripts/mysql_install_db.sh (BUG#3383) -- removed comment from scripts/mysql_install_db.sh about - needing to install an init script, since we supply this already - -------------------------------------------------------------------- -Wed Jul 5 12:54:13 CEST 2000 - grimmer@suse.de - -- removed DBI perl module from subpackage mysqperl (is in a - separate package "perl_dbi" now) and adjusted file list - (BUG#3173) - -------------------------------------------------------------------- -Wed May 24 19:26:20 MEST 2000 - uli@suse.de - -- moved docs to /usr/share - -------------------------------------------------------------------- -Fri May 5 15:35:12 CEST 2000 - freitag@suse.de - -- Security change requested by a feedback mail - sets initially - a full qualified hostname and notifies the user to change the - two root passwords and not only one. -- added autoconf and automake to neededforbuild -- added --host=%{_host} to configure call due to suspicious libtool - probs -- /usr/doc/packages replaced by %{_defaultdocdir} - -------------------------------------------------------------------- -Sat Apr 8 00:21:24 CEST 2000 - bk@suse.de - -- added suse update config macro - -------------------------------------------------------------------- -Wed Feb 23 12:51:51 MET 2000 - grimmer@suse.de - -- Update to 3.22.32 -- created subpackage "mysqllib" which contains shared libs only -- created subpackage "mysqperl" which contains the perl modules -- removed obsolete security patch (is included in new version) -- update now checks for existing database files and chowns them - to "mysql" itself, if they still belong to "root" - specfile - and init script modified -- removed SuSE Linux version from AGREEMENT -- updated README.SuSE to reflect changes - -------------------------------------------------------------------- -Fri Feb 11 17:40:11 MET 2000 - grimmer@suse.de - -- added security patch from monty@tcx.se (password authentication) - -------------------------------------------------------------------- -Thu Jan 13 16:29:16 MET 2000 - grimmer@suse.de - -- update to 3.22.30 (security fix for GRANT privileges) -- now uses version macro in spec file - -------------------------------------------------------------------- -Fri Jan 7 09:55:27 MET 2000 - grimmer@suse.de - -- update to 3.22.29 -- updated Msql-Mysql-modules to 1.2210 and removed obsolete patch -- changed RPM Group of mysqldev to Development/Libraries -- corrected paths in mysqlaccess - -------------------------------------------------------------------- -Thu Oct 28 04:33:56 MEST 1999 - grimmer@suse.de - -- update to 3.22.27 -- updated Msql-Mysql-modules to 1.2209 -- fixed check for ownership of installed db in specfile - -------------------------------------------------------------------- -Mon Oct 25 01:26:07 MEST 1999 - grimmer@suse.de - -- update to 3.22.26a -- now runs as user "mysql" (resolved Bug #371) -- now uses /etc/my.cnf -- updated perl-modules (DBI, Msql-Mysql-modules) -- moved long names from PAC-file to specfile (Provides:) -- misc minor corrections/updates (specfile, init-script...) - -------------------------------------------------------------------- -Mon Aug 30 15:28:36 CEST 1999 - grimmer@suse.de - -- added bugfix for Alpha (TEXT and BLOB were broken) -- modified configure-call in spec -- added long aliases to PAC-files - -------------------------------------------------------------------- -Tue Jul 13 10:14:43 MEST 1999 - grimmer@suse.de - -- update to 3.22.25 -- updated perl-modules (DBI, Msql-Mysql-modules) -- moved libs (mysqlclient.so et al) from /usr/lib/mysql to /usr/lib -- minor corrections (README.SuSE, init-Script) - -------------------------------------------------------------------- -Thu May 20 01:20:25 MEST 1999 - ro@suse.de - -- activate assembler parts only on x86 - -------------------------------------------------------------------- -Wed Apr 28 15:52:37 MEST 1999 - grimmer@suse.de - -- added missing perl module (Mysql.pm) -- added missing perl package (Data-Showtable) - -------------------------------------------------------------------- -Tue Apr 6 17:29:51 MEST 1999 - ro@suse.de - -- update to 3.22.21 -- split into subpackages (mysql, mysqclnt, mysqldev, mysqbnch) -- re-added perl-modules -- updated init-Script -- /etc/mysql.passwd is now obsolete - -------------------------------------------------------------------- -Fri Dec 11 17:02:45 MET 1998 - grimmer@suse.de - -- updated init-Script - -------------------------------------------------------------------- -Sun Nov 29 14:53:08 MET 1998 - bs@suse.de - -- fixed pathes for perl modules. -- remove symlinks before creating them. - -------------------------------------------------------------------- -Fri Nov 27 01:07:18 MET 1998 - ro@suse.de - -- adapted paths to old perl -- this version should not have been in stable - -------------------------------------------------------------------- -Tue Nov 24 17:58:42 MET 1998 - grimmer@suse.de - -- added /usr/doc/packages/AGREEMENT - -------------------------------------------------------------------- -Tue Nov 17 17:00:28 MET 1998 - ro@suse.de - -- adapted paths to perl5.005_02 - -------------------------------------------------------------------- -Wed Nov 11 12:30:18 MET 1998 - ro@suse.de - -- added libgpp to neededforbuild - -------------------------------------------------------------------- -Mon Nov 9 16:49:33 MET 1998 - grimmer@suse.de - -- New Package (Version 3.21.33b) - diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 new file mode 100644 index 0000000..d13a8e2 --- /dev/null +++ b/configuration-tweaks.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5574998e9d4324ff05c8bd698e0bd3cd92b1f449b855759dc6d6db5a486bf053 +size 217 diff --git a/default_plugins.cnf b/default_plugins.cnf deleted file mode 100644 index 66f3d94..0000000 --- a/default_plugins.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[server] -plugin-load=blackhole=ha_blackhole.so -plugin-load=federated=ha_federated.so -plugin-load=archive=ha_archive.so diff --git a/install.inc b/install.inc index 6f54fb9..78a2659 100644 --- a/install.inc +++ b/install.inc @@ -7,14 +7,20 @@ install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug # install the client, extra tools, libraries and the standard server make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym +# remove handler socket client +rm -f %buildroot%_libdir/libhsclient* +rm -f %buildroot%_bindir/hsclient* +rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a +rm -f %buildroot%_libdir/libmysqlservices*a rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la rm -f %buildroot%_libdir/mysql/plugin/*a # XXX: package these? The ndb tools are linked statically atm rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run -rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} @@ -45,29 +51,33 @@ filelist mysqlslap >mysql-bench.files filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >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_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files +filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mytop hsclient >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files +filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table,select_all} >mysql-ndb-extra.files ### files not installed by make install # Create directory structure -DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) +DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) DOCDIR=%buildroot%_defaultdocdir/%name install -d -m 755 ${DOCDIR} install -d -m 755 %buildroot/etc/logrotate.d install -d -m 755 %buildroot/etc/init.d install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql -%if 0%{?prefered} > 0 +%if 0%{?prefered} > 0%{?use_cmake} install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so %endif install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf -install -m 644 "${DOCS[@]}" ${DOCDIR} +for i in "${DOCS[@]}"; do + install -m 644 "${i}" "${DOCDIR}" || true +done install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql +# this is used by the init script +install -m 755 -d %buildroot/var/run/mysql # SuSEfirewall service description install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql @@ -108,14 +118,17 @@ done rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so -rm -rf '%buildroot'/%_libdir/*.a rm -rf '%buildroot'/%_includedir rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal +rm -rf '%buildroot'/%_libdir/*.a %endif sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then + mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf +fi mkdir -p '%buildroot'/etc/mysql -[ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql +bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf - diff --git a/mariadb-5.2.10.tar.bz2 b/mariadb-5.2.10.tar.bz2 new file mode 100644 index 0000000..4b5cd55 --- /dev/null +++ b/mariadb-5.2.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4f129108f512b1853e17d0fd83a84c2e025c5f5c9ee53dd72e651491f200c38 +size 19112928 diff --git a/mariadb-5.2.9.tar.bz2 b/mariadb-5.2.9.tar.bz2 deleted file mode 100644 index d9bfe59..0000000 --- a/mariadb-5.2.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ada8f5bcdedf48f74b8d0c1d8180c35a811f3a6b2446d1f58941cf3e5f4d461 -size 19019197 diff --git a/mariadb-strict-aliasing.patch b/mariadb-strict-aliasing.patch deleted file mode 100644 index a494320..0000000 --- a/mariadb-strict-aliasing.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- storage/pbxt/src/Makefile.am.orig -+++ storage/pbxt/src/Makefile.am -@@ -40,17 +40,19 @@ libpbxt_la_SOURCES = $(non_mysql_interna - # These are the warning Drizzle uses: - # DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter - --libpbxt_la_CXXFLAGS = -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN --libpbxt_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99 -+libpbxt_la_CXXFLAGS = -shared $(AM_CXXFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN -+libpbxt_la_CFLAGS = -shared $(AM_CFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN -std=c99 - libpbxt_la_LDFLAGS = -module - - noinst_LTLIBRARIES = libpbxt_s.la libpbxt_s_embedded.la libpbxt_s_common.la - - libpbxt_s_common_la_SOURCES = $(non_mysql_internal_sources) -+libpbxt_s_common_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing - libpbxt_s_la_SOURCES = $(mysql_internal_sources) -+libpbxt_s_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing - libpbxt_s_la_LIBADD = libpbxt_s_common.la - libpbxt_s_embedded_la_SOURCES = $(mysql_internal_sources) --libpbxt_s_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@ -+libpbxt_s_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing @plugin_embedded_defs@ - libpbxt_s_embedded_la_LIBADD = libpbxt_s_common.la - - EXTRA_DIST = pbms_enabled.cc win_inttypes.h ---- storage/innodb_plugin/buf/buf0flu.c.orig -+++ storage/innodb_plugin/buf/buf0flu.c -@@ -112,7 +112,9 @@ buf_flush_insert_in_flush_rbt( - p_node = rbt_prev(buf_pool->flush_rbt, c_node); - - if (p_node != NULL) { -- prev = *rbt_value(buf_page_t*, p_node); -+ buf_page_t** value; -+ value = rbt_value(buf_page_t*, p_node); -+ prev = *value; - ut_a(prev != NULL); - } - ---- storage/sphinx/Makefile.am.orig -+++ storage/sphinx/Makefile.am -@@ -35,17 +35,17 @@ pkgplugin_LTLIBRARIES = @plugin_sphinx_s - - ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) \ - -L$(top_builddir)/libservices -lmysqlservices --ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN -+ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN - ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_sphinx_la_SOURCES = ha_sphinx.cc - - sphinx_la_LDFLAGS = -module -avoid-version --sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -+sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing - sphinx_la_CFLAGS = $(AM_CFLAGS) - sphinx_la_SOURCES = snippets_udf.cc - - noinst_LTLIBRARIES = @plugin_sphinx_static_target@ --libsphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -+libsphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing - libsphinx_la_CFLAGS = $(AM_CFLAGS) - libsphinx_la_SOURCES= ha_sphinx.cc - ---- storage/xtradb/buf/buf0flu.c.orig -+++ storage/xtradb/buf/buf0flu.c -@@ -113,7 +113,9 @@ buf_flush_insert_in_flush_rbt( - p_node = rbt_prev(buf_pool->flush_rbt, c_node); - - if (p_node != NULL) { -- prev = *rbt_value(buf_page_t*, p_node); -+ buf_page_t** value; -+ value = rbt_value(buf_page_t*, p_node); -+ prev = *value; - ut_a(prev != NULL); - } - diff --git a/mariadb.changes b/mariadb.changes index 66bd63d..8120fef 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Jan 30 08:46:31 UTC 2012 - mhrusecky@suse.cz + +- adding /ush/share/aclocal in files +- renaming *-debug package to *-debug-version to avoid conflicts + +------------------------------------------------------------------- +Mon Jan 30 08:23:32 UTC 2012 - mhrusecky@suse.cz + +- adding missing buildrequires (fixes build for factory) + +------------------------------------------------------------------- +Thu Dec 8 10:39:05 CET 2011 - mhrusecky@suse.cz + +- migrated to the new common template +- updated to MariaDB 5.2.10 + * Release notes: + http://kb.askmonty.org/v/mariadb-5210-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-5210-changelog + +------------------------------------------------------------------- +Wed Nov 23 09:27:43 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Wed Nov 2 12:55:18 UTC 2011 - bkutil@suse.com diff --git a/mariadb.spec b/mariadb.spec index 5f5301b..07ac9f0 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,9 @@ # Few definitions which will alter build %define prefered 0 +%define use_cmake 0 %define cluster 0 -%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb +%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -30,14 +31,13 @@ #Vendor: %vendor Name: mariadb -Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.2.9 +Summary: Server part of MariaDB +Version: 5.2.10 Release: 1 -%define srv_vers 5.1.57 +%define srv_vers 5.1.60 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers -Url: http://www.mysql.com -# http://askmonty.org/downloads/r/http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.47/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz +Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf Source3: README.debug @@ -49,15 +49,16 @@ Source9: mysql-patches.tar.bz2 Source10: build.inc Source11: install.inc Source12: series +Source13: configuration-tweaks.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils -PreReq: coreutils sed grep PreReq: %install_info_prereq %insserv_prereq %endif -BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel zlib-devel +BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel +BuildRequires: autoconf automake cmake libtool zlib-devel %if 0%{?suse_version} -BuildRequires: libevent-devel pwdutils tcpd-devel +BuildRequires: pwdutils tcpd-devel %endif %if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 BuildRequires: fdupes @@ -74,8 +75,11 @@ Requires: logrotate Requires: %{name}-client perl-base Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql < %{srv_vers} +Obsoletes: mysql-Max < %{srv_vers} +%endif Conflicts: otherproviders(mysql) -Patch1: mariadb-strict-aliasing.patch %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL @@ -84,13 +88,50 @@ the Maria storage engine. This package only contains the server-side programs. -%if ! 0%{?prefered} > 0 +%if 0%{?prefered} > 0 -#------------------------------------------------------------------------------- +%package -n libmysqlclient-devel +# mysql-devel was last used in openSUSE 10.2 +Provides: mysql-devel = %srv_vers-%release +Obsoletes: mysql-devel < %srv_vers +Requires: libmysqlclient16 = %version +Requires: libmysqlclient_r16 = %version +Requires: glibc-devel +Requires: openssl-devel +Requires: zlib-devel +Summary: MariaDB development header files and libraries +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +Group: Development/Libraries/C and C++ + +%description -n libmysqlclient-devel +This package contains the development header files and libraries +necessary to develop client applications for MariaDB. + +%package -n libmysqld16 +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +Summary: MariaDB embedded server development files +Group: Development/Libraries/C and C++ + +%description -n libmysqld16 +This package contains the development header files and libraries +for developing applications that embed the MariaDB. + +%package -n libmysqld-devel +License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +Summary: MariaDB embedded server development files +# the headers files are the shared +Requires: libmysqlclient-devel = %version +Requires: tcpd-devel +Requires: libmysqld16 = %version +Group: Development/Libraries/C and C++ + +%description -n libmysqld-devel +This package contains the development header files and libraries +for developing applications that embed the MariaDB. +%endif %package -n libmariadbclient16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries +Summary: Shared Libraries for MariaDB License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/Other @@ -98,15 +139,8 @@ Group: Development/Libraries/Other This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. -Authors: --------- - Michael Widenius - David Axmark - -#------------------------------------------------------------------------------- %package -n libmariadbclient_r16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries +Summary: Shared Libraries for MariaDB License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/Other @@ -114,180 +148,59 @@ Group: Development/Libraries/Other This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. -Authors: --------- - Michael Widenius - David Axmark - -%endif -%if 0%{?prefered} > 0 - -#------------------------------------------------------------------------------- - -%package -n libmysqlclient-devel -#------------------------------------------------------------------------------- -# mysql-devel was last used in openSUSE 10.2 -Provides: mysql-devel = %srv_vers-%release -Requires: libmysqlclient16 = %{version} libmysqlclient_r16 = %{version} glibc-devel zlib-devel openssl-devel -Summary: MariaDB Development Header Files and Libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Group: Development/Libraries/C and C++ - -%description -n libmysqlclient-devel -This package contains the development header files and libraries -necessary to develop MariaDB client applications. - -Authors: --------- - Michael Widenius - David Axmark - -#------------------------------------------------------------------------------- -%package -n libmysqld0 -#------------------------------------------------------------------------------- -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB embedded server development files -# the headers files are the shared -Requires: libmysqlclient-devel = %{version} -Group: Development/Libraries/C and C++ - -%description -n libmysqld0 -This package contains the development header files and libraries -for developing application that embed the MariaDB server - - -#------------------------------------------------------------------------------- -%package -n libmysqld-devel -#------------------------------------------------------------------------------- -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB embedded server development files -# the headers files are the shared -Requires: libmysqlclient-devel = %{version} -Requires: libmysqld0 = %{version} -Group: Development/Libraries/C and C++ - -%description -n libmysqld-devel -This package contains the development header files and libraries -for developing application that embed the MariaDB server - -#------------------------------------------------------------------------------- -%package -n libmysqlclient16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Group: Development/Libraries/Other - -%description -n libmysqlclient16 -This package contains the shared libraries (.so) which certain -languages and applications need to dynamically load and use MariaDB. - -Authors: --------- - Michael Widenius - David Axmark - - -#------------------------------------------------------------------------------- -%package -n libmysqlclient_r16 -#------------------------------------------------------------------------------- -Summary: MariaDB Shared Libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Group: Development/Libraries/Other - -%description -n libmysqlclient_r16 -This package contains the shared libraries (.so) which certain -languages and applications need to dynamically load and use MariaDB. - -Authors: --------- - Michael Widenius - David Axmark - -%endif - -#------------------------------------------------------------------------------- - %package client -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB Client +Summary: Client for MariaDB Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-client < %{srv_vers} +%endif Conflicts: otherproviders(mysql-client) %description client -This package contains the standard MariaDB clients. +This package contains the standard clients for MariaDB. -Authors: --------- - Michael Widenius - David Axmark - - -#------------------------------------------------------------------------------- %package bench -#------------------------------------------------------------------------------- Requires: %{name}-client perl-DBD-mysql License: LGPLv2.1 -Summary: MariaDB - Benchmarks +Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-bench < %{srv_vers} +%endif Conflicts: otherproviders(mysql-bench) %description bench -This package contains MariaDB benchmark scripts and data. +This package contains benchmark scripts and data for MariaDB. To run these database benchmarks, start the script "run-all-tests" in the directory /usr/share/sql-bench after starting MariaDB. -Authors: --------- - Michael Widenius - David Axmark -#------------------------------------------------------------------------------- -%if %{defined mdkversion} - -%package debuging - -%else - -%package debug -%endif -#------------------------------------------------------------------------------- +%package debug-version License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB server with debug options turned on +Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} +Provides: %{name}-debug = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-debug < %{srv_vers} +%endif Conflicts: otherproviders(mysql-debug) -%if %{defined mdkversion} - -%description debuging - -%else - -%description debug - -%endif -A version of the mysql server that has some debug code turned on. +%description debug-version +A version of the MariaDB that has some debug code turned on. It should be only used to track down problems with the standard -servers. Note that merely installing this package won't replace the +servers. Note that merely installing this package will bot replace the standard server. Read /usr/share/doc/packages/mysql/README.debug for information on how to use the debug server. -Authors: --------- - Michael Widenius - David Axmark - -#------------------------------------------------------------------------------- - %package test -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT -Summary: MariaDB testsuite +Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} Requires: %{name}-client = %{version} @@ -295,22 +208,17 @@ Requires: perl-DBD-mysql Requires: %{name}-tools = %{version} Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-test < %{srv_vers} +%endif Conflicts: otherproviders(mysql-test) %description test -This package contains the MariaDB test scripts and data. +This package contains the test scripts and data for MariaDB. To run the testsuite, run /usr/share/mysql-test/suse-test-run. -Authors: --------- - Michael Widenius - David Axmark - - -#------------------------------------------------------------------------------- %package tools -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB tools Group: Productivity/Databases/Servers @@ -318,27 +226,23 @@ Requires: perl-DBD-mysql # make sure this package is installed when updating from 10.2 and older Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror Provides: mysql-tools = %{srv_vers} +%if 0%{?prefered} > 0 +Obsoletes: mysql-tools < %{srv_vers} +%endif Conflicts: otherproviders(mysql-tools) %description tools -A set of scripts for administering a MariaDB server or developing +A set of scripts for administering a MariaDB or developing applications with MariaDB. -Authors: --------- - Michael Widenius - David Axmark - %if 0%{?cluster} > 0 -#------------------------------------------------------------------------------- - %package ndb-storage -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine Group: Productivity/Databases/Servers Provides: mysql-ndb-storage = %{srv_vers} +Obsoletes: mysql-ndb-storage < %{srv_vers} Conflicts: otherproviders(mysql-ndb-storage) %description ndb-storage @@ -347,13 +251,12 @@ It is necessary to have this package installed on all computers that should store ndbcluster table data. -#------------------------------------------------------------------------------- %package ndb-management -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine management Group: Productivity/Databases/Servers Provides: mysql-ndb-management = %{srv_vers} +Obsoletes: mysql-ndb-management < %{srv_vers} Conflicts: otherproviders(mysql-ndb-management) %description ndb-management @@ -361,40 +264,32 @@ This package contains ndbcluster storage engine management. It is necessary to have this package installed on at least one computer in the cluster. - -#------------------------------------------------------------------------------- %package ndb-tools -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine basic tools Group: Productivity/Databases/Servers Provides: mysql-ndb-tools = %{srv_vers} +Obsoletes: mysql-ndb-tools < %{srv_vers} Conflicts: otherproviders(mysql-ndb-tools) %description ndb-tools This package contains ndbcluster storage engine basic tools. - -#------------------------------------------------------------------------------- %package ndb-extra -#------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine extra tools Group: Productivity/Databases/Servers Provides: mysql-ndb-extra = %{srv_vers} +Obsoletes: mysql-ndb-extra < %{srv_vers} Conflicts: otherproviders(mysql-ndb-extra) %description ndb-extra This package contains some extra ndbcluster storage engine tools for the advanced user. They should be used with caution. - %endif -#------------------------------------------------------------------------------- - %prep -#------------------------------------------------------------------------------- -%setup -q -n mariadb-%version -D -a 9 +%setup -q -n mariadb-%{version} -D -a 9 cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . # apply patches from series @@ -411,39 +306,31 @@ rm -f man/ndbd_redo_log_reader.1 # breaks VPATH builds when in sourcedir, is generated in the builddirs rm -f sql/sql_builtin.cc sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh -%if ! 0%{?prefered} > 0 +%if 0%{prefered} < 1 for i in `grep -Rl mysqlclient .`; do sed -i 's|mysqlclient|mariadbclient|g' $i done %endif -%patch1 - -#------------------------------------------------------------------------------- %build -#------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/build.inc)} -#------------------------------------------------------------------------------- - %install -#------------------------------------------------------------------------------- %{expand:%(cat %_sourcedir/install.inc)} -#------------------------------------------------------------------------------- - %pre -#------------------------------------------------------------------------------- /usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || : /usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \ -s /bin/false -d /var/lib/mysql mysql 2> /dev/null || : /usr/sbin/usermod -g mysql -s /bin/false mysql || : -#------------------------------------------------------------------------------- +####################################################################### +# preun and posttran takes care of restart # +####################################################################### %preun -#------------------------------------------------------------------------------- [ $1 = 1 ] || /usr/sbin/rcmysql stop + %pretrans -p if posix.access("/usr/sbin/rcmysql", "x") then restart = os.execute("/usr/sbin/rcmysql status > /dev/null") @@ -464,7 +351,6 @@ if posix.stat(dbfile, "uid") == 0 then end %posttrans -#------------------------------------------------------------------------------- %install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* if [ -d /var/lib/mysql ]; then touch /var/lib/mysql/.run-mysql_upgrade @@ -479,83 +365,36 @@ if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d /var/run/mysql/restar rmdir /var/run/mysql/restart || : fi -%if ! 0%{prefered} > 0 - -#------------------------------------------------------------------------------- +####################################################################### +# Various ldconfig post scripts # +####################################################################### %post -n libmariadbclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %postun -n libmariadbclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %post -n libmariadbclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %postun -n libmariadbclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- -%endif %if 0%{prefered} > 0 -#------------------------------------------------------------------------------- +%post -n libmysqld18 -p /sbin/ldconfig -%post -n libmysqlclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%postun -n libmysqlclient16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%post -n libmysqlclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%postun -n libmysqlclient_r16 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%post -n libmysqld0 -p /sbin/ldconfig -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%postun -n libmysqld0 -p /sbin/ldconfig -#------------------------------------------------------------------------------- +%postun -n libmysqld18 -p /sbin/ldconfig %endif -#------------------------------------------------------------------------------- - %postun -#------------------------------------------------------------------------------- if [ $1 = 0 ]; then %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* %{insserv_cleanup} fi -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- - -%clean -#------------------------------------------------------------------------------- -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- +####################################################################### +# Files section # +####################################################################### %files -f mysql.files -#------------------------------------------------------------------------------- %defattr(-, root, root) %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf %dir %attr(0750, root, mysql) /etc/mysql @@ -566,111 +405,55 @@ fi /etc/init.d/mysql /usr/sbin/rcmysql /usr/share/mysql/ +%ghost %dir %attr(755,mysql,mysql)/var/run/mysql %dir %{_libdir}/mysql %{_libdir}/mysql/mysqld.sym %config /etc/sysconfig/SuSEfirewall2.d/services/mysql %dir %_libdir/mysql/plugin %_libdir/mysql/plugin/*.so -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files client -f mysql-client.files -#------------------------------------------------------------------------------- %defattr(-, root, root) -%config /etc/mysqlaccess.conf -#------------------------------------------------------------------------------- +%config(noreplace) %attr(0640, root, mysql) /etc/mysqlaccess.conf -%if ! 0%{prefered} > 0 -#------------------------------------------------------------------------------- - -%files -n libmariadbclient16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmariadbclient.so.* -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%files -n libmariadbclient_r16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmariadbclient_r.so.* -#------------------------------------------------------------------------------- - -%endif %if 0%{prefered} > 0 -#------------------------------------------------------------------------------- %files -n libmysqlclient-devel -f libmysqlclient-devel.files -#------------------------------------------------------------------------------- %defattr(-, root, root) /usr/include/mysql %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so +%dir /usr/share/aclocal /usr/share/aclocal/mysql.m4 -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files -n libmysqld-devel -#------------------------------------------------------------------------------- %defattr(-,root,root) %_libdir/libmysqld.a %_libdir/libmysqld.so -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- - -%files -n libmysqld0 -#------------------------------------------------------------------------------- +%files -n libmysqld18 %defattr(-,root,root) %_libdir/libmysqld.so.* -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%files -n libmysqlclient16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmysqlclient.so.* -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- - -%files -n libmysqlclient_r16 -#------------------------------------------------------------------------------- -%defattr(-, root, root) -%{_libdir}/libmysqlclient_r.so.* -#------------------------------------------------------------------------------- %endif -#------------------------------------------------------------------------------- +%files -n libmariadbclient16 +%defattr(-, root, root) +%{_libdir}/libmariadbclient.so.* + +%files -n libmariadbclient_r16 +%defattr(-, root, root) +%{_libdir}/libmariadbclient_r.so.* %files bench -f mysql-bench.files -#------------------------------------------------------------------------------- %defattr(-, root, root) /usr/share/sql-bench -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -%if %{defined mdkversion} - -%files debuging -%else - -%files debug -%endif -#------------------------------------------------------------------------------- +%files debug-version %defattr(-, root, root) /usr/sbin/mysqld-debug %{_libdir}/mysql/mysqld-debug.sym -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files test -f mysql-test.files -#------------------------------------------------------------------------------- %defattr(-, root, root) %{_bindir}/my_safe_process %_mandir/man1/mysql-test-run.pl.1* @@ -679,37 +462,23 @@ fi %dir %attr(755, root, root)/usr/share/mysql-test /usr/share/mysql-test/[^v]* %dir %attr(755, mysql, mysql) /usr/share/mysql-test/var -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files tools -f mysql-tools.files %defattr(-, root, root) %_bindir/mysqlrepair %_bindir/mysqlanalyze %_bindir/mysqloptimize -#------------------------------------------------------------------------------- %if 0%{cluster} > 0 -#------------------------------------------------------------------------------- %files ndb-storage -f mysql-ndb-storage.files -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files ndb-management -f mysql-ndb-management.files -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files ndb-tools -f mysql-ndb-tools.files -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- %files ndb-extra -f mysql-ndb-extra.files -#------------------------------------------------------------------------------- + %endif %changelog diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index 61605f2..9edb975 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d03c3a824fe4f07732525a6ea1b001ec3291fb97b830eecaf43fc3c1ea27bda -size 16959 +oid sha256:a9c129c091ef319d1d3519dbac9e65011d8ad06b2eadda0776b793e276cd4348 +size 16277 diff --git a/series b/series index 06ad93c..1764e1f 100644 --- a/series +++ b/series @@ -9,12 +9,12 @@ mariadb-5.2.6-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch -mysql-community-server-5.1.51-myslq-test.patch +mariadb-5.2.10-myslq-test.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch -mariadb-5.2.6-plugins-avoid-version.patch +mariadb-5.2.10-plugins-avoid-version.patch mariadb-5.1.50-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch mariadb-5.2.4-libmysql-no-pkglibdir.patch mysql-community-server-5.1.53-ssl-compilation-fix.patch -mariadb-5.2.6-compilation-fix.patch +mariadb-5.2.10-compilation-fix.patch