[Pkg-mysql-commits] r1101 - trunk/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2007-12-19 21:00:21 +0000 (Wed, 19 Dec 2007)
New Revision: 1101

Removed:
   trunk/debian/patches/43_scripts__mysql_update__password.dpatch
   trunk/debian/patches/88_mctype_attrib.dpatch
Log:
Drop patches disabled by Monty.

Deleted: trunk/debian/patches/43_scripts__mysql_update__password.dpatch
===================================================================
--- trunk/debian/patches/43_scripts__mysql_update__password.dpatch	2007-12-19 16:03:59 UTC (rev 1100)
+++ trunk/debian/patches/43_scripts__mysql_update__password.dpatch	2007-12-19 21:00:21 UTC (rev 1101)
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 43_scripts__mysql_update__password.dpatch by <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds --password option needed for /etc/mysql/debian-start.
-## DP: http://bugs.mysql.com/bug.php?id=19400
-
- at DPATCH@
-
---- old/scripts/mysql_upgrade_shell.sh.ch	2006-04-27 21:54:24.000000000 +0200
-+++ new/scripts/mysql_upgrade_shell.sh	2006-04-27 21:54:55.000000000 +0200
-@@ -14,6 +14,7 @@
- 
- 
- user=root
-+password=''
- 
- case "$1" in
-     --no-defaults|--defaults-file=*|--defaults-extra-file=*)
-@@ -36,6 +37,7 @@
-     case "$arg" in
-       --basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-       --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-+      --password=*) password=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-       --ldata=*|--data=*|--datadir=*) DATADIR=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-       --force) force=1 ;;
-       --verbose) verbose=1 ;;
-@@ -100,6 +103,7 @@
-   echo "  --datadir  Specifies the data directory"
-   echo "  --force    Mysql_upgrade.info file will be ignored"
-   echo "  --user     Username for server login if not current user"
-+  echo "  --password Password for server login if not empty"
-   echo "  --verbose  Display more output about the process"
-   echo ""
- 
-@@ -179,7 +179,7 @@
-     then
-        echo "mysql_upgrade already done for this version"
-     fi
--    $bindir/mysql_fix_privilege_tables --silent $args
-+    $bindir/mysql_fix_privilege_tables --silent --user=$user --password=$password $args
-     exit 0
-   fi
- fi
-@@ -185,7 +189,7 @@
- # Run the upgrade
- #
- 
--check_args="--check-upgrade --all-databases --auto-repair --user=$user"
-+check_args="--check-upgrade --all-databases --auto-repair --user=$user --password=$password"
- 
- if test $verbose = 1
- then
-@@ -200,4 +204,4 @@
-   echo "@MYSQL_BASE_VERSION@" > $CHECK_FILE
- fi
- 
--$bindir/mysql_fix_privilege_tables --silent --user=$user $args
-+$bindir/mysql_fix_privilege_tables --silent --user=$user --password=$password $args

Deleted: trunk/debian/patches/88_mctype_attrib.dpatch
===================================================================
--- trunk/debian/patches/88_mctype_attrib.dpatch	2007-12-19 16:03:59 UTC (rev 1100)
+++ trunk/debian/patches/88_mctype_attrib.dpatch	2007-12-19 21:00:21 UTC (rev 1101)
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by  <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: http://bugs.debian.org/403082
-## DP: http://bugs.mysql.com/bug.php?id=25118
-
- at DPATCH@
-
---- old/include/m_ctype.h	2006-12-02 18:29:32.000000000 +0000
-+++ new/include/m_ctype.h	2006-12-18 20:00:04.000000000 +0000
-@@ -155,6 +155,43 @@
- extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
- extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
- 
-+/*
-+  Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
-+  Some forms of __attribute__ are actually supported in earlier versions of
-+  g++, but we just disable them all because we only use them to generate
-+  compilation warnings.
-+*/
-+#ifndef __attribute__
-+# if !defined(__GNUC__)
-+#  define __attribute__(A)
-+# elif GCC_VERSION < 2008
-+#  define __attribute__(A)
-+# elif defined(__cplusplus) && GCC_VERSION < 3004
-+#  define __attribute__(A)
-+# endif
-+#endif
-+
-+/*
-+  __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
-+  But that's already covered by the __attribute__ tests above, so this is
-+  just a convenience macro.
-+*/
-+#ifndef ATTRIBUTE_FORMAT
-+# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
-+#endif
-+
-+/*
-+
-+   __attribute__((format(...))) on a function pointer is not supported
-+   until  gcc 3.1
-+*/
-+#ifndef ATTRIBUTE_FORMAT_FPTR
-+# if (GCC_VERSION >= 3001)
-+#  define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
-+# else
-+#  define ATTRIBUTE_FORMAT_FPTR(style, m, n)
-+# endif /* GNUC >= 3.1 */
-+#endif
- 
- /* See strings/CHARSET_INFO.txt about information on this structure  */
- typedef struct my_charset_handler_st