Commit 488de6cc authored by unknown's avatar unknown
Browse files

WL# 2094, Federated Storage Handler. This patch fixes bug #8599, HPUX compile errors. 

Testing on hp3750 shows these fixes fix the compile problems on HPUX, but I have 
a problem where when I run the tests, the test shows that the tables default to MyISAM!


include/mysql.h:
  HPUX's compiler does not like 'ulong' - the compile fails due to this.
sql/ha_federated.h:
  Serg's recommendation to fix bug #8599 (which is a good fix since it's obviously 
  from when I added the method via cut and paste ;). Also caught some comment style issues.
parent 2041ea1f

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ MYSQL_FIELD_OFFSET STDCALL mysql_field_seek(MYSQL_RES *result, 
					   MYSQL_FIELD_OFFSET offset);

MYSQL_ROW	STDCALL mysql_fetch_row(MYSQL_RES *result);

unsigned long * STDCALL mysql_fetch_lengths(MYSQL_RES *result);

void            STDCALL cli_fetch_lengths(ulong *to, MYSQL_ROW column,

void            STDCALL cli_fetch_lengths(unsigned long *to, MYSQL_ROW column,

                                          unsigned int field_count);

MYSQL_FIELD *	STDCALL mysql_fetch_field(MYSQL_RES *result);

MYSQL_RES *     STDCALL mysql_list_fields(MYSQL *mysql, const char *table,

sql/ha_federated.h

+8 −5
Original line number Diff line number Diff line
@@ -32,13 +32,16 @@ 
  FEDERATED_SHARE is a structure that will be shared amoung all open handlers

  The example implements the minimum of what you will probably need.

*/

//FIX document

typedef struct st_federated_share {

  char *table_name;

  char *table_base_name;

  // the primary select query to be used in rnd_init

  /* 

    the primary select query to be used in rnd_init

  */

  char *select_query;

  // remote host info, parse_url supplies

  /*

    remote host info, parse_url supplies

  */

  char *scheme;

  char *hostname;

  char *username;
@@ -73,7 +76,7 @@ class ha_federated: public handler 
      return errorcode otherwise

  */

  uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row);

  bool ha_federated::create_where_from_key(String *to, KEY *key_info, 

  bool create_where_from_key(String *to, KEY *key_info, 

                             const byte *key, uint key_length); 



public: