summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmysql.version2
-rw-r--r--mysql-string-overflow.patch17
-rw-r--r--mysql.5.5.23.spec (renamed from mysql.5.5.22.spec)4
-rw-r--r--mysql55.spec9
4 files changed, 11 insertions, 21 deletions
diff --git a/libmysql.version b/libmysql.version
index dc32cd7..409009e 100644
--- a/libmysql.version
+++ b/libmysql.version
@@ -142,4 +142,6 @@ libmysqlclient_18 {
mysql_net_realloc;
# PHP's mysqli.so requires this (via the ER() macro)
mysql_client_errors;
+# mydumper requires this (added by remi)
+ my_net_read;
};
diff --git a/mysql-string-overflow.patch b/mysql-string-overflow.patch
index f86d3b9..54f6d40 100644
--- a/mysql-string-overflow.patch
+++ b/mysql-string-overflow.patch
@@ -37,19 +37,4 @@ diff -up mysql-5.5.21/sql/sql_trigger.cc.coverity mysql-5.5.21/sql/sql_trigger.c
}
-Error: STRING_OVERFLOW:
-/builddir/build/BUILD/mysql-5.1.61/storage/innodb_plugin/handler/ha_innodb.cc:6544: fixed_size_dest: You might overrun the 512 byte fixed-size string "name2" by copying "name" without checking the length.
-/builddir/build/BUILD/mysql-5.1.61/storage/innodb_plugin/handler/ha_innodb.cc:6544: parameter_as_source: Note: This defect has an elevated risk because the source argument is a parameter of the current function.
-
-diff -up mysql-5.5.21/storage/innobase/handler/ha_innodb.cc.coverity mysql-5.5.21/storage/innobase/handler/ha_innodb.cc
---- mysql-5.5.21/storage/innobase/handler/ha_innodb.cc.coverity 2012-03-13 17:28:52.982738150 +0100
-+++ mysql-5.5.21/storage/innobase/handler/ha_innodb.cc 2012-03-13 17:29:14.952427553 +0100
-@@ -6926,7 +6926,7 @@ ha_innobase::create(
- DBUG_RETURN(HA_ERR_TO_BIG_ROW);
- }
-
-- strcpy(name2, name);
-+ strncpy(name2, name, sizeof(name2)-1);
-
- normalize_table_name(norm_name, name2);
-
+
diff --git a/mysql.5.5.22.spec b/mysql.5.5.23.spec
index 459e06c..fd36141 100644
--- a/mysql.5.5.22.spec
+++ b/mysql.5.5.23.spec
@@ -24,7 +24,7 @@
%define mysql_vendor_2 Sun Microsystems, Inc.
%define mysql_vendor Oracle and/or its affiliates
-%define mysql_version 5.5.22
+%define mysql_version 5.5.23
%define mysqld_user mysql
%define mysqld_group mysql
@@ -241,7 +241,7 @@
Name: MySQL%{product_suffix}
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
-Version: 5.5.22
+Version: 5.5.23
Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
Distribution: %{distro_description}
License: Copyright (c) 2000, 2012, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
diff --git a/mysql55.spec b/mysql55.spec
index 045cfd1..571a12f 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -1,6 +1,6 @@
Name: mysql
-Version: 5.5.22
-Release: 1%{?dist}.1
+Version: 5.5.23
+Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
Group: Applications/Databases
@@ -803,7 +803,10 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
-* Sat Mar 24 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.5.22-1.1
+* Fri Apr 13 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.5.23-1
+- update to MySQL 5.5.23 Community Server GA
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-23.html
+- export my_net_read for mydumper
- sync patches with rawhide
* Sat Mar 24 2012 Tom Lane <tgl@redhat.com> 5.5.22-1