*** is/taxonomy.php	Wed Sep  5 16:27:59 2012
--- should/taxonomy.php	Wed Sep  5 16:50:37 2012
***************
*** 2225,2231 ****
  			if ( in_array($tt_id, $final_tt_ids) )
  				$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
  		if ( $values )
! 			$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
  	}
  
  	do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids);
--- 2225,2232 ----
  			if ( in_array($tt_id, $final_tt_ids) )
  				$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
  		if ( $values )
! 			if ( false === $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)"))
! 				return new WP_Error('db_insert_error', __('Could not insert term relationship into the database'), $wpdb->last_error);
  	}
  
  	do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids);
