SOURCES: mysql_5x_strict.patch - upstream update

[glen]

Author: glen                         Date: Sat Apr 15 11:31:38 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- upstream update

---- Files affected:
SOURCES:
   mysql_5x_strict.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mysql_5x_strict.patch
diff -u SOURCES/mysql_5x_strict.patch:1.1 SOURCES/mysql_5x_strict.patch:1.2
--- SOURCES/mysql_5x_strict.patch:1.1	Tue Jan 17 11:00:41 2006
+++ SOURCES/mysql_5x_strict.patch	Sat Apr 15 13:31:32 2006
@@ -1,6 +1,6 @@
-diff -ruBbd cacti-0.8.6h/cacti.sql yak/cacti.sql
---- cacti-0.8.6h/cacti.sql	2006-01-03 22:08:36.000000000 -0500
-+++ yak/cacti.sql	2006-01-07 16:21:36.406250000 -0500
+diff -ruBbd cacti-0.8.6h/cacti.sql cacti-0.8.6h-patched/cacti.sql
+--- cacti-0.8.6h/cacti.sql	2006-01-03 22:08:30.000000000 -0500
++++ cacti-0.8.6h-patched/cacti.sql	2006-01-25 00:16:43.000000000 -0500
 @@ -1846,7 +1846,7 @@
    avg_time decimal(10,5) default '0.00000',
    total_polls int(12) unsigned default '0',
@@ -10,9 +10,42 @@
    PRIMARY KEY  (id)
  ) TYPE=MyISAM;
  
-diff -ruBbd cacti-0.8.6h/lib/database.php yak/lib/database.php
---- cacti-0.8.6h/lib/database.php	2006-01-03 22:08:36.000000000 -0500
-+++ yak/lib/database.php	2006-01-07 14:43:36.156250000 -0500
+diff -ruBbd cacti-0.8.6h/lib/auth.php cacti-0.8.6h-patched/lib/auth.php
+--- cacti-0.8.6h/lib/auth.php	2006-01-03 22:08:30.000000000 -0500
++++ cacti-0.8.6h-patched/lib/auth.php	2006-01-25 00:20:48.000000000 -0500
+@@ -40,25 +40,25 @@
+ 	$user_auth_perms = db_fetch_assoc("select * from user_auth_perms where user_id = '$old_id'");
+ 	foreach ($user_auth_perms as $row) {
+ 		$row['user_id'] = $new_id;
+-		sql_save($row, 'user_auth_perms', array('user_id', 'item_id', 'type'));
++		sql_save($row, 'user_auth_perms', array('user_id', 'item_id', 'type'), false);
+ 	}
+ 
+ 	$user_auth_realm = db_fetch_assoc("select * from user_auth_realm where user_id = '$old_id'");
+ 	foreach ($user_auth_realm as $row) {
+ 		$row['user_id'] = $new_id;
+-		sql_save($row, 'user_auth_realm', array('realm_id', 'user_id'));
++		sql_save($row, 'user_auth_realm', array('realm_id', 'user_id'), false);
+ 	}
+ 
+ 	$settings_graphs = db_fetch_assoc("select * from settings_graphs where user_id = '$old_id'");
+ 	foreach ($settings_graphs as $row) {
+ 		$row['user_id'] = $new_id;
+-		sql_save($row, 'settings_graphs', array('user_id', 'name'));
++		sql_save($row, 'settings_graphs', array('user_id', 'name'), false);
+ 	}
+ 
+ 	$settings_tree = db_fetch_assoc("select * from settings_tree where user_id = '$old_id'");
+ 	foreach ($settings_tree as $row) {
+ 		$row['user_id'] = $new_id;
+-		sql_save($row, 'settings_tree', array('user_id', 'graph_tree_item_id'));
++		sql_save($row, 'settings_tree', array('user_id', 'graph_tree_item_id'), false);
+ 	}
+ }
+ 
+diff -ruBbd cacti-0.8.6h/lib/database.php cacti-0.8.6h-patched/lib/database.php
+--- cacti-0.8.6h/lib/database.php	2006-01-03 22:08:30.000000000 -0500
++++ cacti-0.8.6h-patched/lib/database.php	2006-01-25 00:16:43.000000000 -0500
 @@ -214,14 +214,14 @@
     @arg $table_name - the name of the table to make the replacement in
     @arg $key_cols - the primary key(s)
@@ -30,10 +63,31 @@
  
  	/* get the last AUTO_ID and return it */
  	if ($cnn_id->Insert_ID() == "0") {
-diff -ruBbd cacti-0.8.6h/lib/template.php yak/lib/template.php
---- cacti-0.8.6h/lib/template.php	2006-01-03 22:08:36.000000000 -0500
-+++ yak/lib/template.php	2006-01-07 15:08:31.953125000 -0500
-@@ -643,10 +642,16 @@
+diff -ruBbd cacti-0.8.6h/lib/import.php cacti-0.8.6h-patched/lib/import.php
+--- cacti-0.8.6h/lib/import.php	2006-01-03 22:08:30.000000000 -0500
++++ cacti-0.8.6h-patched/lib/import.php	2006-01-25 00:21:16.000000000 -0500
+@@ -341,7 +341,7 @@
+ 			$save["t_value"] = $item_array["t_value"];
+ 			$save["value"] = addslashes(xml_character_decode($item_array["value"]));
+ 
+-			sql_save($save, "data_input_data", array("data_template_data_id", "data_input_field_id"));
++			sql_save($save, "data_input_data", array("data_template_data_id", "data_input_field_id"), false);
+ 		}
+ 	}
+ 
+@@ -419,7 +419,7 @@
+ 					$save["data_template_rrd_id"] = resolve_hash_to_id($sub_item_array["data_template_rrd_id"], $hash_cache);
+ 					$save["snmp_field_name"] = $sub_item_array["snmp_field_name"];
+ 
+-					sql_save($save, "snmp_query_graph_rrd", array("snmp_query_graph_id", "data_template_id", "data_template_rrd_id"));
++					sql_save($save, "snmp_query_graph_rrd", array("snmp_query_graph_id", "data_template_id", "data_template_rrd_id"), false);
+ 				}
+ 			}
+ 
+diff -ruBbd cacti-0.8.6h/lib/template.php cacti-0.8.6h-patched/lib/template.php
+--- cacti-0.8.6h/lib/template.php	2006-01-03 22:08:30.000000000 -0500
++++ cacti-0.8.6h-patched/lib/template.php	2006-01-25 00:16:43.000000000 -0500
+@@ -643,10 +643,16 @@
  
  					/* if there are no '|' characters, all of the substitutions were successful */
  					if (!strstr($subs_string, "|query")) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysql_5x_strict.patch?r1=1.1&r2=1.2&f=u