[Pkg-mysql-commits] r899 - in branches/sid-5.0/debian: . patches
Sean Finney
seanius at alioth.debian.org
Tue Jul 17 08:38:00 UTC 2007
Author: seanius
Date: 2007-07-17 08:38:00 +0000 (Tue, 17 Jul 2007)
New Revision: 899
Removed:
branches/sid-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch
Modified:
branches/sid-5.0/debian/changelog
branches/sid-5.0/debian/patches/00list
Log:
patch incorporated upstream
Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog 2007-07-17 08:36:53 UTC (rev 898)
+++ branches/sid-5.0/debian/changelog 2007-07-17 08:38:00 UTC (rev 899)
@@ -4,6 +4,7 @@
[sean finney]
* removed patches that are incorporated into the latest release:
- 70_cpuid_on_i486.dpatch
+ - 91_SECURITY_CVE-2007-2691_alter-drop
-- sean finney <seanius at debian.org> Tue, 17 Jul 2007 10:12:07 +0200
Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list 2007-07-17 08:36:53 UTC (rev 898)
+++ branches/sid-5.0/debian/patches/00list 2007-07-17 08:38:00 UTC (rev 899)
@@ -11,4 +11,3 @@
86_PATH_MAX.dpatch
88_mctype_attrib.dpatch
89_ndb__staticlib.dpatch
-91_SECURITY_CVE-2007-2691_alter-drop.dpatch
Deleted: branches/sid-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch 2007-07-17 08:36:53 UTC (rev 898)
+++ branches/sid-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch 2007-07-17 08:38:00 UTC (rev 899)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# taken from http://lists.mysql.com/commits/24642?f=plain
-
- at DPATCH@
---- 1.496/sql/sql_parse.cc 2007-04-17 16:52:53 +05:00
-+++ 1.497/sql/sql_parse.cc 2007-04-17 16:52:53 +05:00
-@@ -3161,7 +3161,7 @@ unsent_create_error:
- */
- old_list= table[0];
- new_list= table->next_local[0];
-- if (check_grant(thd, ALTER_ACL, &old_list, 0, 1, 0) ||
-+ if (check_grant(thd, ALTER_ACL | DROP_ACL, &old_list, 0, 1, 0) ||
- (!test_all_bits(table->next_local->grant.privilege,
- INSERT_ACL | CREATE_ACL) &&
- check_grant(thd, INSERT_ACL | CREATE_ACL, &new_list, 0, 1, 0)))
More information about the Pkg-mysql-commits
mailing list