[Pkg-mysql-commits] r1001 - branches/etch-5.0/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2007-11-15 14:54:57 +0000 (Thu, 15 Nov 2007)
New Revision: 1001

Modified:
   branches/etch-5.0/debian/patches/00list
   branches/etch-5.0/debian/patches/94_SECURITY_CVE-2007-5925.dpatch
Log:
Merge from sid-5.0

Modified: branches/etch-5.0/debian/patches/00list
===================================================================
--- branches/etch-5.0/debian/patches/00list	2007-11-15 14:46:09 UTC (rev 1000)
+++ branches/etch-5.0/debian/patches/00list	2007-11-15 14:54:57 UTC (rev 1001)
@@ -23,3 +23,4 @@
 92_SECURITY_CVE-2007-2692_thd_privs.dpatch
 93_SECURITY_CVE-2007-3780.dpatch
 93_SECURITY_CVE-2007-3782.dpatch
+94_SECURITY_CVE-2007-5925.dpatch

Modified: branches/etch-5.0/debian/patches/94_SECURITY_CVE-2007-5925.dpatch
===================================================================
--- branches/etch-5.0/debian/patches/94_SECURITY_CVE-2007-5925.dpatch	2007-11-15 14:46:09 UTC (rev 1000)
+++ branches/etch-5.0/debian/patches/94_SECURITY_CVE-2007-5925.dpatch	2007-11-15 14:54:57 UTC (rev 1001)
@@ -1,9 +1,13 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_SECURITY_CVE-2007-5925.dpatch by  <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
 
 @DPATCH@
-diff -ru innobase/include/db0err.h.orig innobase/include/db0err.h
---- innobase/include/db0err.h.orig	2007-07-04 16:06:59.000000000 +0300
-+++ innobase/include/db0err.h	2007-11-15 10:23:51.000000000 +0200
+diff -ru old/innobase/include/db0err.h new/innobase/include/db0err.h
+--- old/innobase/include/db0err.h	2007-07-04 16:06:59.000000000 +0300
++++ new/innobase/include/db0err.h	2007-11-15 10:23:51.000000000 +0200
 @@ -57,6 +57,18 @@
  					buffer pool (for big transactions,
  					InnoDB stores the lock structs in the
@@ -23,9 +27,9 @@
  
  /* The following are partial failure codes */
  #define DB_FAIL 		1000
-diff -ru innobase/include/page0cur.h.orig innobase/include/page0cur.h
---- innobase/include/page0cur.h.orig	2007-07-04 16:06:10.000000000 +0300
-+++ innobase/include/page0cur.h	2007-11-15 10:23:51.000000000 +0200
+diff -ru old/innobase/include/page0cur.h new/innobase/include/page0cur.h
+--- old/innobase/include/page0cur.h	2007-07-04 16:06:10.000000000 +0300
++++ new/innobase/include/page0cur.h	2007-11-15 10:23:51.000000000 +0200
 @@ -22,6 +22,7 @@
  
  /* Page cursor search modes; the values must be in this order! */
@@ -34,9 +38,9 @@
  #define	PAGE_CUR_G	1
  #define	PAGE_CUR_GE	2
  #define	PAGE_CUR_L	3
-diff -ru sql/ha_innodb.cc.orig sql/ha_innodb.cc
---- sql/ha_innodb.cc.orig	2007-07-04 16:06:48.000000000 +0300
-+++ sql/ha_innodb.cc	2007-11-15 10:25:55.000000000 +0200
+diff -ru old/sql/ha_innodb.cc new/sql/ha_innodb.cc
+--- old/sql/ha_innodb.cc	2007-07-04 16:06:48.000000000 +0300
++++ new/sql/ha_innodb.cc	2007-11-15 10:25:55.000000000 +0200
 @@ -526,6 +526,9 @@
   		}