Commit b857b6e7 authored by unknown's avatar unknown

myisam/sort.c:my_var_write and mysys/hash.c:hash_key made static inline,

not simply inline, to fix the linking failure on Sun Solaris 9 (sparc)
with Sun Studio 9, reported by Peter Harvey.


myisam/sort.c:
  my_var_write made static inline (fix for a link failure)
mysys/hash.c:
  hash_key made static inline (fix a link failure)
parent 83fce55a
...@@ -84,7 +84,9 @@ static int NEAR_F write_merge_key_varlen(MI_SORT_PARAM *info, ...@@ -84,7 +84,9 @@ static int NEAR_F write_merge_key_varlen(MI_SORT_PARAM *info,
IO_CACHE *to_file, IO_CACHE *to_file,
char* key, uint sort_length, char* key, uint sort_length,
uint count); uint count);
inline int my_var_write(MI_SORT_PARAM *info,IO_CACHE *to_file, byte *bufs); static inline int
my_var_write(MI_SORT_PARAM *info, IO_CACHE *to_file, byte *bufs);
/* /*
Creates a index of sorted keys Creates a index of sorted keys
...@@ -625,7 +627,8 @@ static int NEAR_F write_keys(MI_SORT_PARAM *info, register uchar **sort_keys, ...@@ -625,7 +627,8 @@ static int NEAR_F write_keys(MI_SORT_PARAM *info, register uchar **sort_keys,
} /* write_keys */ } /* write_keys */
inline int my_var_write(MI_SORT_PARAM *info, IO_CACHE *to_file, byte *bufs) static inline int
my_var_write(MI_SORT_PARAM *info, IO_CACHE *to_file, byte *bufs)
{ {
int err; int err;
uint16 len = _mi_keylength(info->keyinfo, (uchar*) bufs); uint16 len = _mi_keylength(info->keyinfo, (uchar*) bufs);
......
...@@ -146,7 +146,7 @@ void hash_reset(HASH *hash) ...@@ -146,7 +146,7 @@ void hash_reset(HASH *hash)
handle inline functions that are not defined as native types handle inline functions that are not defined as native types
*/ */
inline char* static inline char*
hash_key(HASH *hash,const byte *record,uint *length,my_bool first) hash_key(HASH *hash,const byte *record,uint *length,my_bool first)
{ {
if (hash->get_key) if (hash->get_key)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment