New upstream release. (Closes: #695001) Refreshed patches.

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2206 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

11 files changed, 100 insertions, 53 deletions

diff --git a/debian/changelog b/debian/changelog
index 30184ba..8fd0038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-mysql-5.5 (5.5.28+dfsg-2) UNRELEASED; urgency=low
+mysql-5.5 (5.5.29+dfsg-1) UNRELEASED; urgency=low
 
   * d/mysql-server-5.5.postinst: Patch from Alex Bligh to fix privilege
     regression that was introduced in the switch from 5.1 to 5.5.
     (Closes: #692871)
+  * New upstream release. (Closes: #695001) Refreshed patches.
 
  -- Clint Byrum <clint@ubuntu.com>  Tue, 27 Nov 2012 06:07:25 -0800
 
diff --git a/debian/patches/1_hurd.patch b/debian/patches/1_hurd.patch
index dbd44e7..562b358 100644
--- a/debian/patches/1_hurd.patch
+++ b/debian/patches/1_hurd.patch
@@ -4,8 +4,10 @@ Bug: http://bugs.mysql.com/bug.php?id=64685
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651002
 Last-Update: 2012-03-18
 Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
---- /dev/null
-+++ b/cmake/os/GNU.cmake
+Index: mysql-5.5.29/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
 @@ -0,0 +1,20 @@
 +# This file includes GNU/Hurd specific options and quirks, related to system checks
 +
@@ -27,8 +29,10 @@ Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
 +
 +# 64 bit file offset support flag
 +SET(_FILE_OFFSET_BITS 64)
---- a/mysql-test/lib/My/Platform.pm
-+++ b/mysql-test/lib/My/Platform.pm
+Index: mysql-5.5.29/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
 @@ -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
diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.patch b/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
index be06efb..3b8a643 100644
--- a/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
+++ b/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
@@ -8,18 +8,20 @@ Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527623
 Last-Update: 2012-03-07
 Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
 
---- a/scripts/mysqld_safe.sh
-+++ b/scripts/mysqld_safe.sh
+Index: mysql-5.5.29/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
 @@ -29,8 +29,6 @@
  syslog_tag_mysqld=mysqld
  syslog_tag_mysqld_safe=mysqld_safe
  
 -trap '' 1 2 3 15			# we shouldn't let anyone kill us
 -
- umask 007
- 
- defaults=
-@@ -132,7 +130,7 @@
+ # MySQL-specific environment variable. First off, it's not really a umask,
+ # it's the desired mode. Second, it follows umask(2), not umask(3) in that
+ # octal needs to be explicit. Our shell might be a proper sh without printf,
+@@ -153,7 +151,7 @@
        # sed buffers output (only GNU sed supports a -u (unbuffered) option)
        # which means that messages may not get sent to syslog until the
        # mysqld process quits.
@@ -28,7 +30,7 @@ Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
        ;;
      *)
        echo "Internal program error (non-fatal):" \
-@@ -711,6 +709,13 @@
+@@ -740,6 +738,13 @@
  fi
  
  #
diff --git a/debian/patches/62_disable_tests.patch b/debian/patches/62_disable_tests.patch
index 55dc2f4..6faba81 100644
--- a/debian/patches/62_disable_tests.patch
+++ b/debian/patches/62_disable_tests.patch
@@ -3,8 +3,10 @@ Subject: Convenient place to disable tests that are currently failing
 Forwarded: not-needed
 Last-Update: 2012-03-07
 Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
---- a/mysql-test/t/disabled.def
-+++ b/mysql-test/t/disabled.def
+Index: mysql-5.5.29/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
 @@ -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
diff --git a/debian/patches/70_mysql_va_list.patch b/debian/patches/70_mysql_va_list.patch
index 21ab4ea..d94adb4 100644
--- a/debian/patches/70_mysql_va_list.patch
+++ b/debian/patches/70_mysql_va_list.patch
@@ -4,8 +4,10 @@ Description: make sure va_list usage is portable to fix FTBFS on ARM
 Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
 Last-Update: 2012-10-24
 
---- a/sql-common/client_plugin.c
-+++ b/sql-common/client_plugin.c
+Index: mysql-5.5.29/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
 @@ -233,11 +233,13 @@
  {
    MYSQL mysql;
diff --git a/debian/patches/71_disable_rpl_tests.patch b/debian/patches/71_disable_rpl_tests.patch
index c8fe54e..7c34cba 100644
--- a/debian/patches/71_disable_rpl_tests.patch
+++ b/debian/patches/71_disable_rpl_tests.patch
@@ -3,8 +3,10 @@ Bug-Ubuntu: http://pad.lv/894146
 Forwarded: no, not needed
 Description: disables test to allow build to pass while this is investigated.
 
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
+Index: mysql-5.5.29/mysql-test/suite/rpl/t/disabled.def
+===================================================================
+--- mysql-5.5.29.orig/mysql-test/suite/rpl/t/disabled.def	2013-01-02 15:36:15.226363842 -0800
++++ mysql-5.5.29/mysql-test/suite/rpl/t/disabled.def	2013-01-02 15:38:12.591482068 -0800
 @@ -15,3 +15,4 @@
  rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
  rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
diff --git a/debian/patches/72_fix_standalone_tests.patch b/debian/patches/72_fix_standalone_tests.patch
index 49f5f7c..f884f5d 100644
--- a/debian/patches/72_fix_standalone_tests.patch
+++ b/debian/patches/72_fix_standalone_tests.patch
@@ -4,8 +4,10 @@ Description: makes mtr look in the standard location from the
 Forwarded: not-needed
 Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
 Last-Update: 2012-10-24
---- a/mysql-test/lib/mtr_cases.pm
-+++ b/mysql-test/lib/mtr_cases.pm
+Index: mysql-5.5.29/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
 @@ -287,7 +287,8 @@
      else
      {
diff --git a/debian/patches/93_kfreebsd_tests.patch b/debian/patches/93_kfreebsd_tests.patch
index 3aaa8ce..0c3f124 100644
--- a/debian/patches/93_kfreebsd_tests.patch
+++ b/debian/patches/93_kfreebsd_tests.patch
@@ -5,8 +5,10 @@ Subject: tests not getting started on kFreeBSD
  file name truncation was barfing even for the shortened form.
 Forwarded: no
 Last-Update: 2012-04-28
---- a/mysql-test/lib/My/Platform.pm
-+++ b/mysql-test/lib/My/Platform.pm
+Index: mysql-5.5.29/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
 @@ -113,6 +113,8 @@
    # Similarly the path length is hidden.
    # See Debian bug #651002
diff --git a/debian/patches/94_spelling.patch b/debian/patches/94_spelling.patch
index 1d9c310..a5778d7 100644
--- a/debian/patches/94_spelling.patch
+++ b/debian/patches/94_spelling.patch
@@ -3,8 +3,10 @@ Subject: spelling errors
  Preceeding -> preceding
 Last-Update: 2012-10-24
 Forwarded: no
---- a/libmysql/errmsg.c
-+++ b/libmysql/errmsg.c
+Index: mysql-5.5.29/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
 @@ -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",
@@ -14,8 +16,10 @@ Forwarded: no
    "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",
---- a/mysql-test/extra/rpl_tests/rpl_ddl.test
-+++ b/mysql-test/extra/rpl_tests/rpl_ddl.test
+Index: mysql-5.5.29/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
 @@ -98,8 +98,8 @@
  #       --> less switching of AUTOCOMMIT mode on master side.
  #
@@ -27,8 +31,10 @@ Forwarded: no
  #       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
---- a/mysql-test/extra/rpl_tests/rpl_row_basic.test
-+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test
+Index: mysql-5.5.29/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
 @@ -221,7 +221,7 @@
  SELECT * FROM t7 ORDER BY C1;
  
@@ -47,8 +53,10 @@ Forwarded: no
  # temprorarily
  set @@global.slave_exec_mode= 'IDEMPOTENT';
  
---- a/mysql-test/include/wait_until_count_sessions.inc
-+++ b/mysql-test/include/wait_until_count_sessions.inc
+Index: mysql-5.5.29/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
 @@ -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
@@ -58,8 +66,10 @@ Forwarded: no
  #       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
---- a/mysql-test/suite/funcs_1/views/func_view.inc
-+++ b/mysql-test/suite/funcs_1/views/func_view.inc
+Index: mysql-5.5.29/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
 @@ -282,7 +282,7 @@
  #               other interesting value
  #     numbers   -> 0
@@ -69,8 +79,10 @@ Forwarded: no
  #     FIXME enum, set ??
  INSERT INTO t1_values SET
         my_char_30 = ' ---äÖüß@µ*$-- ',
---- a/mysql-test/suite/funcs_1/views/views_master.inc
-+++ b/mysql-test/suite/funcs_1/views/views_master.inc
+Index: mysql-5.5.29/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
 @@ -545,7 +545,7 @@
  #                   view names are accepted, at creation time, alteration time,
  #                   and drop time.
@@ -80,8 +92,10 @@ Forwarded: no
  #               database name
  --disable_warnings
  DROP VIEW  IF EXISTS v1 ;
---- a/mysql-test/suite/rpl/t/rpl_ddl.test
-+++ b/mysql-test/suite/rpl/t/rpl_ddl.test
+Index: mysql-5.5.29/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
 @@ -13,10 +13,10 @@
  #         sequences start.
  #
@@ -95,8 +109,10 @@ Forwarded: no
  #         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
---- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
-+++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
+Index: mysql-5.5.29/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
 @@ -239,7 +239,7 @@
  UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1;
  SELECT * FROM t1 ORDER BY a;
@@ -106,9 +122,11 @@ Forwarded: no
  # temprorarily
  set @@global.slave_exec_mode= 'IDEMPOTENT';
  --echo **** On Master ****
---- a/sql/log_event.cc
-+++ b/sql/log_event.cc
-@@ -3267,7 +3267,7 @@
+Index: mysql-5.5.29/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 @@
      if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
      {
        const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
@@ -117,8 +135,10 @@ Forwarded: no
                    "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,
---- a/storage/myisam/mi_rnext.c
-+++ b/storage/myisam/mi_rnext.c
+Index: mysql-5.5.29/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
 @@ -64,7 +64,7 @@
        Normally SQL layer would never request "search next" if
        "search first" failed. But HANDLER may do anything.
@@ -128,8 +148,10 @@ Forwarded: no
        equals to mi_rfirst(), we must restore original state
        as if failing mi_rfirst() was not called.
      */
---- a/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
-+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
+Index: mysql-5.5.29/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
 @@ -41,7 +41,7 @@
   * Test returning descriptor information
   *
@@ -139,8 +161,10 @@ Forwarded: no
   * -# ???
   * 
   * @return Zero, if test succeeded
---- a/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
-+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+Index: mysql-5.5.29/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
 @@ -41,7 +41,7 @@
   * Test returning descriptor information
   *
diff --git a/debian/patches/regex_plus.patch b/debian/patches/regex_plus.patch
index 5094e46..fe5c3d0 100644
--- a/debian/patches/regex_plus.patch
+++ b/debian/patches/regex_plus.patch
@@ -3,8 +3,10 @@ Subject: FTBS when in build directory containing '+'
 Bug-Debian: http://bugs.debian.org/674210
 Bug: http://bugs.mysql.com/bug.php?id=65408
 Last-Update: 2012-05-24
---- a/mysql-test/include/mysqld--help.inc
-+++ b/mysql-test/include/mysqld--help.inc
+Index: mysql-5.5.29/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
 @@ -47,7 +47,11 @@
      s/\b4294967295\b/18446744073709551615/;
      s/\b2146435072\b/9223372036853727232/;
@@ -18,8 +20,10 @@ Last-Update: 2012-05-24
      next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
      next if $skip;
      print;
---- a/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
-+++ b/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
+Index: mysql-5.5.29/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
 @@ -7,6 +7,7 @@
  # TODO: fix with a proper comparison in mysqltest
  let $rcd= `SELECT REPLACE('$MYSQL_CHARSETSDIR', '\\\\\', '.')`;
diff --git a/debian/patches/versioned_symbols.patch b/debian/patches/versioned_symbols.patch
index 720f3d7..7b52211 100644
--- a/debian/patches/versioned_symbols.patch
+++ b/debian/patches/versioned_symbols.patch
@@ -3,8 +3,10 @@ Bug: http://bugs.mysql.com/bug.php?id=64386
 Debian-Bug: http://bugs.debian.org/660686
 Subject: versioned symbols got dropped from the build
 Last-Update: 2012-06-01
---- a/libmysql/CMakeLists.txt
-+++ b/libmysql/CMakeLists.txt
+Index: mysql-5.5.29/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
 @@ -136,6 +136,8 @@
  
  )