bk commit into 5.1 tree (patg:1.2246) BUG#19773

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2246 06/07/10 11:57:29 patg@stripped +1 -0
  Small fix to mysql-5.1-engines, from merge from BUG #19773

  sql/ha_federated.h
    1.32 06/07/10 11:57:13 patg@stripped +1 -1
    Small fix to mysql-5.1-engines, from merge from BUG #19773

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-engines

--- 1.31/sql/ha_federated.h	2006-07-06 16:07:20 -07:00
+++ 1.32/sql/ha_federated.h	2006-07-10 11:57:13 -07:00
@@ -165,7 +165,7 @@
       return errorcode otherwise
   */
   uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row,
-                                      MYSQL_RES *row);
+                                      MYSQL_RES *result);
   bool create_where_from_key(String *to, KEY *key_info, 
                              const key_range *start_key,
                              const key_range *end_key,