diff options
| author | pem@mysql.com <> | 2005-03-08 18:19:21 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2005-03-08 18:19:21 +0100 |
| commit | 699c8f38d89c2811764dd96359655c85530d6e9e (patch) | |
| tree | 72070a8a30d0a3097c2a93483122aa332d5b754c | |
| parent | d8592e88ae354e6d2cb25d60c1aeff0ad027620c (diff) | |
| parent | b2c4d739975bbc57ff12fdf7454ac96a70c36066 (diff) | |
| download | mariadb-git-699c8f38d89c2811764dd96359655c85530d6e9e.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
| -rw-r--r-- | mysys/hash.c | 2 | ||||
| -rw-r--r-- | sql/net_serv.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 9632f9773fd..fe27b5fcb6d 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -175,7 +175,7 @@ static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax, /* for compilers which can not handle inline */ static -#if !defined(__SUNPRO_C) && !defined(__USLC__) && !defined(__sgi) +#if !defined(__USLC__) && !defined(__sgi) inline #endif unsigned int rec_hashnr(HASH *hash,const byte *record) diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 2de5853599f..4fbbeedb812 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -254,7 +254,7 @@ my_bool my_net_write(NET *net,const char *packet,ulong len) { uchar buff[NET_HEADER_SIZE]; - if (unlikely(!net->vio)) /* nowhere to write */ + if (unlikely(!net->vio)) /* nowhere to write */ return 0; /* Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH |