[Pkg-mysql-commits] r2228 - in mysql-5.5/branches/wheezy/debian: . patches
Clint Byrum
spamaps-guest at alioth.debian.org
Thu May 9 04:32:52 UTC 2013
Author: spamaps-guest
Date: 2013-05-09 04:32:51 +0000 (Thu, 09 May 2013)
New Revision: 2228
Modified:
mysql-5.5/branches/wheezy/debian/changelog
mysql-5.5/branches/wheezy/debian/control
mysql-5.5/branches/wheezy/debian/patches/1_hurd.patch
mysql-5.5/branches/wheezy/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
mysql-5.5/branches/wheezy/debian/patches/62_disable_tests.patch
mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch
mysql-5.5/branches/wheezy/debian/patches/71_disable_rpl_tests.patch
mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch
mysql-5.5/branches/wheezy/debian/patches/93_kfreebsd_tests.patch
mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch
mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch
mysql-5.5/branches/wheezy/debian/patches/series
mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch
Log:
* New upstream release.
SECURITY UPDATE: CVE-2013-2375 CVE-2013-1544 CVE-2013-1532
CVE-2013-2389 CVE-2013-2392 CVE-2013-2376 CVE-2013-1511
CVE-2013-2391 CVE-2013-1502
- Patches refreshed.
- d/p/yassl.patch - dropped, applied upstream
- d/p/debian-mdev382-fixup.patch: dropped, fixed upstream.
* d/control: Updating Vcs-* fields to point at wheezy branch.
Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/changelog 2013-05-09 04:32:51 UTC (rev 2228)
@@ -1,3 +1,16 @@
+mysql-5.5 (5.5.31+dfsg-0+wheezy1) UNRELEASED; urgency=high
+
+ * New upstream release.
+ SECURITY UPDATE: CVE-2013-2375 CVE-2013-1544 CVE-2013-1532
+ CVE-2013-2389 CVE-2013-2392 CVE-2013-2376 CVE-2013-1511
+ CVE-2013-2391 CVE-2013-1502
+ - Patches refreshed.
+ - d/p/yassl.patch - dropped, applied upstream
+ - d/p/debian-mdev382-fixup.patch: dropped, fixed upstream.
+ * d/control: Updating Vcs-* fields to point at wheezy branch.
+
+ -- Clint Byrum <clint at ubuntu.com> Mon, 06 May 2013 12:22:55 -0700
+
mysql-5.5 (5.5.30+dfsg-1.1) unstable; urgency=low
* Non-maintainer upload.
Modified: mysql-5.5/branches/wheezy/debian/control
===================================================================
--- mysql-5.5/branches/wheezy/debian/control 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/control 2013-05-09 04:32:51 UTC (rev 2228)
@@ -7,8 +7,8 @@
Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [any-i386]
Standards-Version: 3.9.3
Homepage: http://dev.mysql.com/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/branches/wheezy
+Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/wheezy
Package: libmysqlclient18
Section: libs
Modified: mysql-5.5/branches/wheezy/debian/patches/1_hurd.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/1_hurd.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/1_hurd.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -4,10 +4,10 @@
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651002
Last-Update: 2012-03-18
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Index: mysql-5.5.29/cmake/os/GNU.cmake
+Index: mysql-5.5-5.5.31+dfsg/cmake/os/GNU.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mysql-5.5.29/cmake/os/GNU.cmake 2013-01-02 15:38:08.271735374 -0800
++++ mysql-5.5-5.5.31+dfsg/cmake/os/GNU.cmake 2013-05-05 09:43:53.000000000 -0700
@@ -0,0 +1,20 @@
+# This file includes GNU/Hurd specific options and quirks, related to system checks
+
@@ -29,10 +29,10 @@
+
+# 64 bit file offset support flag
+SET(_FILE_OFFSET_BITS 64)
-Index: mysql-5.5.29/mysql-test/lib/My/Platform.pm
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm
===================================================================
---- mysql-5.5.29.orig/mysql-test/lib/My/Platform.pm 2013-01-02 15:36:15.398353757 -0800
-+++ mysql-5.5.29/mysql-test/lib/My/Platform.pm 2013-01-02 15:38:08.271735374 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/lib/My/Platform.pm 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm 2013-05-05 23:04:39.000000000 -0700
@@ -110,6 +110,9 @@
# This may not be true, but we can't test for it on AIX due to Perl bug
# See Bug #45771
Modified: mysql-5.5/branches/wheezy/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/38_scripts__mysqld_safe.sh__signals.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/38_scripts__mysqld_safe.sh__signals.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -8,10 +8,10 @@
Last-Update: 2012-03-07
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Index: mysql-5.5.29/scripts/mysqld_safe.sh
+Index: mysql-5.5-5.5.31+dfsg/scripts/mysqld_safe.sh
===================================================================
---- mysql-5.5.29.orig/scripts/mysqld_safe.sh 2013-01-02 15:36:15.330357744 -0800
-+++ mysql-5.5.29/scripts/mysqld_safe.sh 2013-01-02 15:38:10.183623263 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/scripts/mysqld_safe.sh 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/scripts/mysqld_safe.sh 2013-05-05 09:43:53.000000000 -0700
@@ -29,8 +29,6 @@
syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe
Modified: mysql-5.5/branches/wheezy/debian/patches/62_disable_tests.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/62_disable_tests.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/62_disable_tests.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -3,10 +3,10 @@
Forwarded: not-needed
Last-Update: 2012-03-07
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Index: mysql-5.5.29/mysql-test/t/disabled.def
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/t/disabled.def
===================================================================
---- mysql-5.5.29.orig/mysql-test/t/disabled.def 2013-01-02 15:36:15.294359855 -0800
-+++ mysql-5.5.29/mysql-test/t/disabled.def 2013-01-02 15:38:11.455548678 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/t/disabled.def 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/t/disabled.def 2013-05-05 09:43:53.000000000 -0700
@@ -15,3 +15,8 @@
archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
Modified: mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/70_mysql_va_list.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -4,10 +4,10 @@
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
Last-Update: 2012-10-24
-Index: mysql-5.5.29/sql-common/client_plugin.c
+Index: mysql-5.5-5.5.31+dfsg/sql-common/client_plugin.c
===================================================================
---- mysql-5.5.29.orig/sql-common/client_plugin.c 2013-01-02 15:36:15.258361966 -0800
-+++ mysql-5.5.29/sql-common/client_plugin.c 2013-01-02 15:38:12.035514668 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/sql-common/client_plugin.c 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/sql-common/client_plugin.c 2013-05-05 09:43:53.000000000 -0700
@@ -233,11 +233,13 @@
{
MYSQL mysql;
Modified: mysql-5.5/branches/wheezy/debian/patches/71_disable_rpl_tests.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/71_disable_rpl_tests.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/71_disable_rpl_tests.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -3,12 +3,12 @@
Forwarded: no, not needed
Description: disables test to allow build to pass while this is investigated.
-Index: mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/disabled.def
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/disabled.def
===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/mysql-test/suite/rpl/t/disabled.def 2013-03-05 05:45:15.338697730 -0800
-+++ mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/disabled.def 2013-03-05 05:45:15.334697964 -0800
-@@ -14,3 +14,4 @@
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/disabled.def 2013-05-05 09:46:34.599476208 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/disabled.def 2013-05-05 09:47:10.385389482 -0700
+@@ -13,3 +13,4 @@
+ rpl_row_create_table : Bug#11759274 2010-02-27 andrei failed different way than earlier with bug#45576
rpl_spec_variables : BUG#11755836 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
-+rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
+++rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
Modified: mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/72_fix_standalone_tests.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -4,10 +4,10 @@
Forwarded: not-needed
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
Last-Update: 2012-10-24
-Index: mysql-5.5.29/mysql-test/lib/mtr_cases.pm
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/lib/mtr_cases.pm
===================================================================
---- mysql-5.5.29.orig/mysql-test/lib/mtr_cases.pm 2013-01-02 15:36:15.190365953 -0800
-+++ mysql-5.5.29/mysql-test/lib/mtr_cases.pm 2013-01-02 15:38:13.147449465 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/lib/mtr_cases.pm 2013-05-05 09:47:48.135188277 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/lib/mtr_cases.pm 2013-05-05 09:47:48.131188510 -0700
@@ -287,7 +287,8 @@
else
{
Modified: mysql-5.5/branches/wheezy/debian/patches/93_kfreebsd_tests.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/93_kfreebsd_tests.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/93_kfreebsd_tests.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -5,10 +5,10 @@
file name truncation was barfing even for the shortened form.
Forwarded: no
Last-Update: 2012-04-28
-Index: mysql-5.5.29/mysql-test/lib/My/Platform.pm
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm
===================================================================
---- mysql-5.5.29.orig/mysql-test/lib/My/Platform.pm 2013-01-02 15:38:08.271735374 -0800
-+++ mysql-5.5.29/mysql-test/lib/My/Platform.pm 2013-01-02 15:38:13.707416629 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/lib/My/Platform.pm 2013-05-05 09:47:48.155187111 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm 2013-05-05 09:47:48.151187344 -0700
@@ -113,6 +113,8 @@
# Similarly the path length is hidden.
# See Debian bug #651002
Modified: mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -3,10 +3,10 @@
Preceeding -> preceding
Last-Update: 2012-10-24
Forwarded: no
-Index: mysql-5.5.29/libmysql/errmsg.c
+Index: mysql-5.5-5.5.31+dfsg/libmysql/errmsg.c
===================================================================
---- mysql-5.5.29.orig/libmysql/errmsg.c 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/libmysql/errmsg.c 2013-01-02 15:38:14.355378634 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/libmysql/errmsg.c 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/libmysql/errmsg.c 2013-05-05 09:47:48.183185478 -0700
@@ -81,7 +81,7 @@
"Attempt to read a row while there is no result set associated with the statement",
"This feature is not implemented yet",
@@ -16,10 +16,10 @@
"The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again",
"This handle is already connected. Use a separate handle for each connection.",
"Authentication plugin '%s' cannot be loaded: %s",
-Index: mysql-5.5.29/mysql-test/extra/rpl_tests/rpl_ddl.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_ddl.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-01-02 15:38:14.355378634 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-05-05 09:47:48.183185478 -0700
@@ -98,8 +98,8 @@
# --> less switching of AUTOCOMMIT mode on master side.
#
@@ -31,10 +31,10 @@
# because the sql error code of the statement might be 0) bug
# and these rules are ignored, a following test sequence might earn ugly
# effects like failing 'sync_slave_with_master', crashes of the slave or
-Index: mysql-5.5.29/mysql-test/extra/rpl_tests/rpl_row_basic.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_row_basic.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-01-02 15:38:14.355378634 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-05-05 09:47:48.183185478 -0700
@@ -221,7 +221,7 @@
SELECT * FROM t7 ORDER BY C1;
@@ -53,10 +53,10 @@
# temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT';
-Index: mysql-5.5.29/mysql-test/include/wait_until_count_sessions.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/include/wait_until_count_sessions.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/include/wait_until_count_sessions.inc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/include/wait_until_count_sessions.inc 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/include/wait_until_count_sessions.inc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/include/wait_until_count_sessions.inc 2013-05-05 09:47:48.183185478 -0700
@@ -10,7 +10,7 @@
# 1. We wait for $current_sessions <= $count_sessions because in the use case
# with count_sessions.inc before and wait_until_count_sessions.inc after
@@ -66,10 +66,10 @@
# sessions at test begin($count_sessions) = m + n
# sessions of the previous test which will be soon disconnected = n (n >= 0)
# sessions at test end ($current sessions, assuming the test disconnects
-Index: mysql-5.5.29/mysql-test/suite/funcs_1/views/func_view.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/func_view.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/funcs_1/views/func_view.inc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/funcs_1/views/func_view.inc 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/funcs_1/views/func_view.inc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/func_view.inc 2013-05-05 09:47:48.183185478 -0700
@@ -282,7 +282,7 @@
# other interesting value
# numbers -> 0
@@ -79,10 +79,10 @@
# FIXME enum, set ??
INSERT INTO t1_values SET
my_char_30 = ' ---äÖüß@µ*$-- ',
-Index: mysql-5.5.29/mysql-test/suite/funcs_1/views/views_master.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/views_master.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/funcs_1/views/views_master.inc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/funcs_1/views/views_master.inc 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/funcs_1/views/views_master.inc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/views_master.inc 2013-05-05 09:47:48.187185245 -0700
@@ -545,7 +545,7 @@
# view names are accepted, at creation time, alteration time,
# and drop time.
@@ -92,10 +92,10 @@
# database name
--disable_warnings
DROP VIEW IF EXISTS v1 ;
-Index: mysql-5.5.29/mysql-test/suite/rpl/t/rpl_ddl.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_ddl.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/rpl/t/rpl_ddl.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/rpl/t/rpl_ddl.test 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/rpl_ddl.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_ddl.test 2013-05-05 09:47:48.187185245 -0700
@@ -13,10 +13,10 @@
# sequences start.
#
@@ -109,10 +109,10 @@
# because the sql error code of the statement might be 0) bug
# and these rules are ignored, a following test sequence might earn ugly
# effects like failing 'sync_slave_with_master', crashes of the slave or
-Index: mysql-5.5.29/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-05-05 09:47:48.187185245 -0700
@@ -239,7 +239,7 @@
UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1;
SELECT * FROM t1 ORDER BY a;
@@ -122,11 +122,11 @@
# temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT';
--echo **** On Master ****
-Index: mysql-5.5.29/sql/log_event.cc
+Index: mysql-5.5-5.5.31+dfsg/sql/log_event.cc
===================================================================
---- mysql-5.5.29.orig/sql/log_event.cc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/sql/log_event.cc 2013-01-02 15:38:14.363378165 -0800
-@@ -3306,7 +3306,7 @@
+--- mysql-5.5-5.5.31+dfsg.orig/sql/log_event.cc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/sql/log_event.cc 2013-05-05 09:47:48.000000000 -0700
+@@ -3312,7 +3312,7 @@
if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
{
const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
@@ -135,10 +135,10 @@
"the group log file/position: %s %s",
const_cast<Relay_log_info*>(rli)->group_master_log_name,
llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
-Index: mysql-5.5.29/storage/myisam/mi_rnext.c
+Index: mysql-5.5-5.5.31+dfsg/storage/myisam/mi_rnext.c
===================================================================
---- mysql-5.5.29.orig/storage/myisam/mi_rnext.c 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/storage/myisam/mi_rnext.c 2013-01-02 15:38:14.363378165 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/storage/myisam/mi_rnext.c 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/storage/myisam/mi_rnext.c 2013-05-05 09:47:48.219183379 -0700
@@ -64,7 +64,7 @@
Normally SQL layer would never request "search next" if
"search first" failed. But HANDLER may do anything.
@@ -148,10 +148,10 @@
equals to mi_rfirst(), we must restore original state
as if failing mi_rfirst() was not called.
*/
-Index: mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
+Index: mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
===================================================================
---- mysql-5.5.29.orig/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-01-02 15:38:14.363378165 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-05-05 09:47:48.231182679 -0700
@@ -41,7 +41,7 @@
* Test returning descriptor information
*
@@ -161,10 +161,10 @@
* -# ???
*
* @return Zero, if test succeeded
-Index: mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+Index: mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
===================================================================
---- mysql-5.5.29.orig/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-01-02 15:38:14.363378165 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-05-05 09:47:48.243181980 -0700
@@ -41,7 +41,7 @@
* Test returning descriptor information
*
Modified: mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/regex_plus.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/674210
Bug: http://bugs.mysql.com/bug.php?id=65408
Last-Update: 2012-05-24
-Index: mysql-5.5.29/mysql-test/include/mysqld--help.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/include/mysqld--help.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/include/mysqld--help.inc 2013-01-02 15:36:15.078372518 -0800
-+++ mysql-5.5.29/mysql-test/include/mysqld--help.inc 2013-01-02 15:38:16.403258546 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/include/mysqld--help.inc 2013-05-05 09:47:48.259181047 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/include/mysqld--help.inc 2013-05-05 09:47:48.255181280 -0700
@@ -47,7 +47,11 @@
s/\b4294967295\b/18446744073709551615/;
s/\b2146435072\b/9223372036853727232/;
@@ -20,10 +20,10 @@
next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
next if $skip;
print;
-Index: mysql-5.5.29/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-01-02 15:36:15.078372518 -0800
-+++ mysql-5.5.29/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-01-02 15:38:16.403258546 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-05-05 09:47:48.259181047 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-05-05 09:47:48.255181280 -0700
@@ -7,6 +7,7 @@
# TODO: fix with a proper comparison in mysqltest
let $rcd= `SELECT REPLACE('$MYSQL_CHARSETSDIR', '\\\\\', '.')`;
Modified: mysql-5.5/branches/wheezy/debian/patches/series
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/series 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/series 2013-05-09 04:32:51 UTC (rev 2228)
@@ -8,5 +8,3 @@
94_spelling.patch
regex_plus.patch
versioned_symbols.patch
-debian-mdev382-fixup.patch
-yassl.patch
Modified: mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch 2013-05-09 04:05:30 UTC (rev 2227)
+++ mysql-5.5/branches/wheezy/debian/patches/versioned_symbols.patch 2013-05-09 04:32:51 UTC (rev 2228)
@@ -3,10 +3,10 @@
Debian-Bug: http://bugs.debian.org/660686
Subject: versioned symbols got dropped from the build
Last-Update: 2012-06-01
-Index: mysql-5.5.29/libmysql/CMakeLists.txt
+Index: mysql-5.5-5.5.31+dfsg/libmysql/CMakeLists.txt
===================================================================
---- mysql-5.5.29.orig/libmysql/CMakeLists.txt 2013-01-02 15:36:15.014376269 -0800
-+++ mysql-5.5.29/libmysql/CMakeLists.txt 2013-01-02 15:38:17.931168951 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/libmysql/CMakeLists.txt 2013-05-05 09:47:48.275180114 -0700
++++ mysql-5.5-5.5.31+dfsg/libmysql/CMakeLists.txt 2013-05-05 09:47:48.275180114 -0700
@@ -136,6 +136,8 @@
)
More information about the Pkg-mysql-commits
mailing list