mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
unknown 2005-02-19 10:45:19 -08:00
parent 2041ea1f0e
commit 488de6cc3f
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mysql.h
View file

@ -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,

13
sql/ha_federated.h
View file

@ -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,8 +76,8 @@ private:
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,
const byte *key, uint key_length);
bool create_where_from_key(String *to, KEY *key_info,
const byte *key, uint key_length);
public:
ha_federated(TABLE *table): handler(table),