Commit 8ea508c1 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

Merge mysql.com:/space/my/mysql-3.23 

into mysql.com:/space/my/mysql-3.23-build
parents 46b51b91 19351839

configure.in

+6 −0
Original line number Diff line number Diff line
@@ -893,6 +893,12 @@ case $SYSTEM_TYPE in 
      echo "Using --with-named-thread=-lpthread"

      with_named_thread="-lpthread"

    fi

    # Fixes for HPUX 11.0 compiler

    if test "$ac_cv_prog_gcc" = "no"

    then

      CFLAGS="$CFLAGS +DD64 -DHAVE_BROKEN_INLINE"

      CXXFLAGS="$CXXFLAGS +DD64 +O2"

    fi

    ;;

  *rhapsody*)

    if test "$ac_cv_prog_gcc" = "yes"

libmysql/password.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void make_scrambled_password(char *to,const char *password) 
  sprintf(to,"%08lx%08lx",hash_res[0],hash_res[1]);

}



static inline uint char_val(char X)

static inline unsigned int char_val(char X)

{

  return (uint) (X >= '0' && X <= '9' ? X-'0' :

		 X >= 'A' && X <= 'Z' ? X-'A'+10 :

mysys/hash.c

+10 −5
Original line number Diff line number Diff line
@@ -83,7 +83,12 @@ void hash_free(HASH *hash) 


	/* some helper functions */



inline byte*

/*

  This function is char* instead of byte* as HPUX11 compiler can't

  handle inline functions that are not defined as native types

*/



inline char*

hash_key(HASH *hash,const byte *record,uint *length,my_bool first)

{

  if (hash->get_key)
@@ -104,7 +109,7 @@ static uint hash_rec_mask(HASH *hash,HASH_LINK *pos,uint buffmax, 
			  uint maxlength)

{

  uint length;

  byte *key=hash_key(hash,pos->data,&length,0);

  byte *key= (byte*) hash_key(hash,pos->data,&length,0);

  return hash_mask((*hash->calc_hashnr)(key,length),buffmax,maxlength);

}
@@ -183,10 +188,10 @@ uint calc_hashnr_caseup(const byte *key, uint len) 
#ifndef __SUNPRO_C				/* SUNPRO can't handle this */

inline

#endif

uint rec_hashnr(HASH *hash,const byte *record)

unsigned int rec_hashnr(HASH *hash,const byte *record)

{

  uint length;

  byte *key=hash_key(hash,record,&length,0);

  byte *key= (byte*) hash_key(hash,record,&length,0);

  return (*hash->calc_hashnr)(key,length);

}
@@ -273,7 +278,7 @@ static void movelink(HASH_LINK *array,uint find,uint next_link,uint newlink) 
static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length)

{

  uint rec_keylength;

  byte *rec_key=hash_key(hash,pos->data,&rec_keylength,1);

  byte *rec_key= (byte*) hash_key(hash,pos->data,&rec_keylength,1);

  return (length && length != rec_keylength) ||

    (hash->flags & HASH_CASE_INSENSITIVE ?

     my_casecmp(rec_key,key,rec_keylength) :

mysys/my_static.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ USED_MEM* my_once_root_block=0; /* pointer to first block */ 
uint	  my_once_extra=ONCE_ALLOC_INIT;	/* Memory to alloc / block */



	/* from my_tempnam */

#ifndef HAVE_TEMPNAM

#if !defined(HAVE_TEMPNAM) || defined(HPUX11)

int _my_tempnam_used=0;

#endif

mysys/my_static.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ extern const char *soundex_map; 
extern USED_MEM* my_once_root_block;

extern uint	 my_once_extra;



#ifndef HAVE_TEMPNAM

#if !defined(HAVE_TEMPNAM) || defined(HPUX11)

extern int	_my_tempnam_used;

#endif