diff options
| author | unknown <konstantin@mysql.com> | 2004-12-16 02:43:35 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-12-16 02:43:35 +0300 |
| commit | b857b6e763d8cd2329c48911a0e82d5506d3d184 (patch) | |
| tree | 5f01fe78073ad00e5c6e846f7b1ba83cf7fb8fa9 /myisam | |
| parent | 83fce55a3ae79c0033e372cb7ec48a3248307d6e (diff) | |
| download | mariadb-git-b857b6e763d8cd2329c48911a0e82d5506d3d184.tar.gz | |
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)
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 3dc066e877c..39bde41e4c9 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -84,7 +84,9 @@ static int NEAR_F write_merge_key_varlen(MI_SORT_PARAM *info, IO_CACHE *to_file, char* key, uint sort_length, 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 @@ -625,7 +627,8 @@ static int NEAR_F write_keys(MI_SORT_PARAM *info, register uchar **sort_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; uint16 len = _mi_keylength(info->keyinfo, (uchar*) bufs); |