diff options
| author | unknown <patg@krsna.patg.net> | 2005-02-19 10:45:19 -0800 |
|---|---|---|
| committer | unknown <patg@krsna.patg.net> | 2005-02-19 10:45:19 -0800 |
| commit | 488de6cc3fbf7f69f655c2c7135517fe78f63c85 (patch) | |
| tree | 4de406b38a84fc3134c64d2e05467a6d7fb1b917 | |
| parent | 2041ea1f0e5f011277b5c719fba7ccc96ea03fb7 (diff) | |
| download | mariadb-git-488de6cc3fbf7f69f655c2c7135517fe78f63c85.tar.gz | |
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.
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rwxr-xr-x | sql/ha_federated.h | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/mysql.h b/include/mysql.h index e37cf710817..828d38f5ec4 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -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, diff --git a/sql/ha_federated.h b/sql/ha_federated.h index e75fd285338..28f28f8aa63 100755 --- a/sql/ha_federated.h +++ b/sql/ha_federated.h @@ -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), |