Merge chilla.local:/home/mydev/mysql-5.1-amerge

into  chilla.local:/home/mydev/mysql-5.1-aid


sql/ha_federated.cc:
  Auto merged

1 files changed, 11 insertions, 3 deletions

diff --git a/sql/ha_federated.h b/sql/ha_federated.h
index 4a4561ba274..eb9ecd37172 100644
--- a/sql/ha_federated.h
+++ b/sql/ha_federated.h
@@ -130,6 +130,7 @@ typedef struct st_federated_share {
     remote host info, parse_url supplies
   */
   char *scheme;
+  char *connect_string;
   char *hostname;
   char *username;
   char *password;
@@ -139,7 +140,7 @@ typedef struct st_federated_share {
   char *socket;
   char *sport;
   ushort port;
-  uint table_name_length, use_count;
+  uint table_name_length, connect_string_length, use_count;
   pthread_mutex_t mutex;
   THR_LOCK lock;
 } FEDERATED_SHARE;
@@ -153,7 +154,6 @@ class ha_federated: public handler
   FEDERATED_SHARE *share;    /* Shared lock info */
   MYSQL *mysql; /* MySQL connection */
   MYSQL_RES *stored_result;
-  uint ref_length;
   uint fetch_num; // stores the fetch num
   MYSQL_ROW_OFFSET current_position;  // Current position used by ::position()
   int remote_error_number;
@@ -164,7 +164,8 @@ private:
       return 0 on success
       return errorcode otherwise
   */
-  uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row);
+  uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row,
+                                      MYSQL_RES *row);
   bool create_where_from_key(String *to, KEY *key_info, 
                              const key_range *start_key,
                              const key_range *end_key,
@@ -304,6 +305,13 @@ public:
   int connection_rollback();
   int connection_autocommit(bool state);
   int execute_simple_query(const char *query, int len);
+
+  int read_next(byte *buf, MYSQL_RES *result);
+  int index_read_idx_with_result_set(byte *buf, uint index,
+                                     const byte *key,
+                                     uint key_len,
+                                     ha_rkey_function find_flag,
+                                     MYSQL_RES **result);
 };
 
 int federated_db_init(void);