From c35c6bfb0d1bc2475c71a8c2113c1ca1c143060f Mon Sep 17 00:00:00 2001 From: orchidman Date: Fri, 3 Aug 2012 07:50:07 +0200 Subject: mysql 5.5.24a-1 (cherry picked from commit 13599a5bb9a8bc65ca9d0ac0e9d111240e690633) Conflicts: mysql/.footprint.i686 mysql/.footprint.x86_64 mysql/.md5sum.i686 mysql/.md5sum.x86_64 mysql/Pkgfile --- mysql/.footprint.i686 | 11 +++++++++++ mysql/.footprint.x86_64 | 11 +++++++++++ mysql/.md5sum.i686 | 2 +- mysql/.md5sum.x86_64 | 2 +- mysql/Pkgfile | 4 ++-- 5 files changed, 26 insertions(+), 4 deletions(-) (limited to 'mysql') diff --git a/mysql/.footprint.i686 b/mysql/.footprint.i686 index 58022f369..209e9c5d8 100644 --- a/mysql/.footprint.i686 +++ b/mysql/.footprint.i686 @@ -581,6 +581,7 @@ drwxr-xr-x root/root usr/mysql-test/r/ -rw-r--r-- root/root usr/mysql-test/r/blackhole_plugin.result -rw-r--r-- root/root usr/mysql-test/r/bool.result -rw-r--r-- root/root usr/mysql-test/r/bootstrap.result +-rw-r--r-- root/root usr/mysql-test/r/bug12427262.result -rw-r--r-- root/root usr/mysql-test/r/bug13633383.result -rw-r--r-- root/root usr/mysql-test/r/bug39022.result -rw-r--r-- root/root usr/mysql-test/r/bug46080.result @@ -2858,8 +2859,10 @@ drwxr-xr-x root/root usr/mysql-test/suite/innodb/r/ -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug11766634.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug12400341.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug12661768.result +-rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug12902967.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug13510739.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug13635833.result +-rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug14007649.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug21704.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug30423.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug30919.result @@ -2968,8 +2971,10 @@ drwxr-xr-x root/root usr/mysql-test/suite/innodb/t/ -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12400341.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12661768.test +-rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12902967.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug13510739.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug13635833.test +-rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug14007649.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug21704.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug30423.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug30919-master.opt @@ -3791,6 +3796,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/r/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result +-rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_binlog_corruption.result @@ -3918,6 +3924,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/r/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_not_null_myisam.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_optimize.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_packet.result +-rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_plugin_load.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_ps.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result @@ -4094,6 +4101,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/t/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test +-rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt @@ -4280,6 +4288,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/t/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_packet-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_packet-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_packet.test +-rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_plugin_load-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_plugin_load.test @@ -4298,6 +4307,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/t/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report.test +-rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report_port-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report_port.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_rewrt_db.test @@ -5544,6 +5554,7 @@ drwxr-xr-x root/root usr/mysql-test/t/ -rw-r--r-- root/root usr/mysql-test/t/bool.test -rw-r--r-- root/root usr/mysql-test/t/bootstrap-master.opt -rw-r--r-- root/root usr/mysql-test/t/bootstrap.test +-rw-r--r-- root/root usr/mysql-test/t/bug12427262.test -rw-r--r-- root/root usr/mysql-test/t/bug13633383.test -rw-r--r-- root/root usr/mysql-test/t/bug39022.test -rw-r--r-- root/root usr/mysql-test/t/bug46080-master.opt diff --git a/mysql/.footprint.x86_64 b/mysql/.footprint.x86_64 index 58022f369..209e9c5d8 100644 --- a/mysql/.footprint.x86_64 +++ b/mysql/.footprint.x86_64 @@ -581,6 +581,7 @@ drwxr-xr-x root/root usr/mysql-test/r/ -rw-r--r-- root/root usr/mysql-test/r/blackhole_plugin.result -rw-r--r-- root/root usr/mysql-test/r/bool.result -rw-r--r-- root/root usr/mysql-test/r/bootstrap.result +-rw-r--r-- root/root usr/mysql-test/r/bug12427262.result -rw-r--r-- root/root usr/mysql-test/r/bug13633383.result -rw-r--r-- root/root usr/mysql-test/r/bug39022.result -rw-r--r-- root/root usr/mysql-test/r/bug46080.result @@ -2858,8 +2859,10 @@ drwxr-xr-x root/root usr/mysql-test/suite/innodb/r/ -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug11766634.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug12400341.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug12661768.result +-rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug12902967.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug13510739.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug13635833.result +-rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug14007649.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug21704.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug30423.result -rw-r--r-- root/root usr/mysql-test/suite/innodb/r/innodb_bug30919.result @@ -2968,8 +2971,10 @@ drwxr-xr-x root/root usr/mysql-test/suite/innodb/t/ -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12400341.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12661768.test +-rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug12902967.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug13510739.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug13635833.test +-rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug14007649.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug21704.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug30423.test -rw-r--r-- root/root usr/mysql-test/suite/innodb/t/innodb_bug30919-master.opt @@ -3791,6 +3796,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/r/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result +-rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_binlog_corruption.result @@ -3918,6 +3924,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/r/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_not_null_myisam.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_optimize.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_packet.result +-rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_plugin_load.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_ps.result -rw-r--r-- root/root usr/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result @@ -4094,6 +4101,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/t/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test +-rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt @@ -4280,6 +4288,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/t/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_packet-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_packet-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_packet.test +-rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_plugin_load-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_plugin_load.test @@ -4298,6 +4307,7 @@ drwxr-xr-x root/root usr/mysql-test/suite/rpl/t/ -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report.test +-rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report_port-master.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_report_port.test -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt -rw-r--r-- root/root usr/mysql-test/suite/rpl/t/rpl_rewrt_db.test @@ -5544,6 +5554,7 @@ drwxr-xr-x root/root usr/mysql-test/t/ -rw-r--r-- root/root usr/mysql-test/t/bool.test -rw-r--r-- root/root usr/mysql-test/t/bootstrap-master.opt -rw-r--r-- root/root usr/mysql-test/t/bootstrap.test +-rw-r--r-- root/root usr/mysql-test/t/bug12427262.test -rw-r--r-- root/root usr/mysql-test/t/bug13633383.test -rw-r--r-- root/root usr/mysql-test/t/bug39022.test -rw-r--r-- root/root usr/mysql-test/t/bug46080-master.opt diff --git a/mysql/.md5sum.i686 b/mysql/.md5sum.i686 index dd423c407..1aa647b0e 100644 --- a/mysql/.md5sum.i686 +++ b/mysql/.md5sum.i686 @@ -1 +1 @@ -dc84f8a0305e054c859533944e79f803 mysql-5.5.24.tar.gz +0841fbc79872c5f467d8c8842f45257a mysql-5.5.25a.tar.gz diff --git a/mysql/.md5sum.x86_64 b/mysql/.md5sum.x86_64 index dd423c407..1aa647b0e 100644 --- a/mysql/.md5sum.x86_64 +++ b/mysql/.md5sum.x86_64 @@ -1 +1 @@ -dc84f8a0305e054c859533944e79f803 mysql-5.5.24.tar.gz +0841fbc79872c5f467d8c8842f45257a mysql-5.5.25a.tar.gz diff --git a/mysql/Pkgfile b/mysql/Pkgfile index cf5c924df..e763eeafb 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -6,9 +6,9 @@ # Run on: mysqlclient name=mysql -version=5.5.24 +version=5.5.25a release=1 -source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/$name-$version.tar.gz) +source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-${version%.*}/$name-$version.tar.gz) build () { source /etc/blfs-bootscripts -- cgit v1.2.3-54-g00ecf