rpms/mysql/devel mysql-innodb-crash.patch,1.1,1.2

[Tom Lane (tgl)]

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10126

Modified Files:
	mysql-innodb-crash.patch 
Log Message:
De-fuzz patch to make new rpm happy.

mysql-innodb-crash.patch:

Index: mysql-innodb-crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-innodb-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-innodb-crash.patch	14 Dec 2007 03:38:55 -0000	1.1
+++ mysql-innodb-crash.patch	27 Jul 2008 18:46:14 -0000	1.2
@@ -1,8 +1,8 @@
 Back-port upstream fix for CVE-2007-5925.
 
-diff -Naur mysql-5.0.45.orig/innobase/include/db0err.h mysql-5.0.45/innobase/include/db0err.h
---- mysql-5.0.45.orig/innobase/include/db0err.h	2007-07-04 09:06:59.000000000 -0400
-+++ mysql-5.0.45/innobase/include/db0err.h	2007-12-13 12:44:05.000000000 -0500
+diff -Naur mysql-5.0.51a.orig/innobase/include/db0err.h mysql-5.0.51a/innobase/include/db0err.h
+--- mysql-5.0.51a.orig/innobase/include/db0err.h	2008-01-11 09:43:41.000000000 -0500
++++ mysql-5.0.51a/innobase/include/db0err.h	2008-07-27 14:40:23.000000000 -0400
 @@ -57,6 +57,18 @@
  					buffer pool (for big transactions,
  					InnoDB stores the lock structs in the
@@ -22,9 +22,9 @@
  
  /* The following are partial failure codes */
  #define DB_FAIL 		1000
-diff -Naur mysql-5.0.45.orig/innobase/include/page0cur.h mysql-5.0.45/innobase/include/page0cur.h
---- mysql-5.0.45.orig/innobase/include/page0cur.h	2007-07-04 09:06:10.000000000 -0400
-+++ mysql-5.0.45/innobase/include/page0cur.h	2007-12-13 12:44:05.000000000 -0500
+diff -Naur mysql-5.0.51a.orig/innobase/include/page0cur.h mysql-5.0.51a/innobase/include/page0cur.h
+--- mysql-5.0.51a.orig/innobase/include/page0cur.h	2008-01-11 09:43:26.000000000 -0500
++++ mysql-5.0.51a/innobase/include/page0cur.h	2008-07-27 14:40:23.000000000 -0400
 @@ -22,6 +22,7 @@
  
  /* Page cursor search modes; the values must be in this order! */
@@ -33,11 +33,11 @@
  #define	PAGE_CUR_G	1
  #define	PAGE_CUR_GE	2
  #define	PAGE_CUR_L	3
-diff -Naur mysql-5.0.45.orig/sql/ha_innodb.cc mysql-5.0.45/sql/ha_innodb.cc
---- mysql-5.0.45.orig/sql/ha_innodb.cc	2007-07-04 09:06:48.000000000 -0400
-+++ mysql-5.0.45/sql/ha_innodb.cc	2007-12-13 12:44:05.000000000 -0500
-@@ -526,6 +526,9 @@
-  		}
+diff -Naur mysql-5.0.51a.orig/sql/ha_innodb.cc mysql-5.0.51a/sql/ha_innodb.cc
+--- mysql-5.0.51a.orig/sql/ha_innodb.cc	2008-01-11 09:43:39.000000000 -0500
++++ mysql-5.0.51a/sql/ha_innodb.cc	2008-07-27 14:40:23.000000000 -0400
+@@ -521,6 +521,9 @@
+                 mark_transaction_to_rollback(thd, TRUE);
  
      		return(HA_ERR_LOCK_TABLE_FULL);
 + 	} else if (error == DB_UNSUPPORTED) {
@@ -46,7 +46,7 @@
      	} else {
      		return(-1);			// Unknown error
      	}
-@@ -3689,11 +3692,21 @@
+@@ -3710,11 +3713,21 @@
  		  and comparison of non-latin1 char type fields in
  		  innobase_mysql_cmp() to get PAGE_CUR_LE_OR_EXTENDS to
  		  work correctly. */
@@ -71,7 +71,7 @@
  }
  
  /*
-@@ -3831,11 +3844,18 @@
+@@ -3852,11 +3865,18 @@
  
  	last_match_mode = (uint) match_mode;
  
@@ -93,7 +93,7 @@
  
  	if (ret == DB_SUCCESS) {
  		error = 0;
-@@ -5150,8 +5170,16 @@
+@@ -5171,8 +5191,16 @@
  	mode2 = convert_search_mode_to_innobase(max_key ? max_key->flag :
                                                  HA_READ_KEY_EXACT);