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

[Sean Finney]

Author: seanius
Date: 2007-05-17 17:53:56 +0000 (Thu, 17 May 2007)
New Revision: 877

Modified:
   branches/etch-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch
Log:
patch fix

Modified: branches/etch-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch
===================================================================
--- branches/etch-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch	2007-05-17 17:35:49 UTC (rev 876)
+++ branches/etch-5.0/debian/patches/91_SECURITY_CVE-2007-2691_alter-drop.dpatch	2007-05-17 17:53:56 UTC (rev 877)
@@ -4,12 +4,12 @@
 @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
-@@ -2818,7 +2818,7 @@ unsent_create_error:
- 	old_list=table[0];
- 	new_list=table->next[0];
- 	old_list.next=new_list.next=0;
--	if (check_grant(thd, ALTER_ACL, &old_list, 0, UINT_MAX, 0) ||
-+	if (check_grant(thd, ALTER_ACL | DROP_ACL, &old_list, 0, UINT_MAX, 0) ||
- 	    (!test_all_bits(table->next->grant.privilege,
+@@ -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,
+ 	     check_grant(thd, INSERT_ACL | CREATE_ACL, &new_list, 0, 1, 0)))