Commit 7bf677dd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kostja/work/mysql-4.1-7428 

into mysql.com:/home/kostja/work/mysql-5.0-root


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
parents 28f86d8f 19493716

include/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ my_bool _hash_init(HASH *hash, CHARSET_INFO *charset, 
		   uint key_length, hash_get_key get_key,

		   void (*free_element)(void*), uint flags CALLER_INFO_PROTO);

void hash_free(HASH *tree);

void hash_reset(HASH *hash);

void my_hash_reset(HASH *hash);

byte *hash_element(HASH *hash,uint idx);

gptr hash_search(HASH *info,const byte *key,uint length);

gptr hash_next(HASH *info,const byte *key,uint length);

mysys/hash.c

+3 −3
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ void hash_free(HASH *hash) 
  Delete all elements from the hash (the hash itself is to be reused).



  SYNOPSIS

    hash_reset()

    my_hash_reset()

    hash   the hash to delete elements of

*/



void hash_reset(HASH *hash)

void my_hash_reset(HASH *hash)

{

  DBUG_ENTER("hash_reset");

  DBUG_ENTER("my_hash_reset");

  DBUG_PRINT("enter",("hash: 0x%lxd",hash));



  hash_free_elements(hash);

sql/net_serv.cc

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,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

sql/sql_class.h

+2 −2
Original line number Diff line number Diff line
@@ -742,8 +742,8 @@ class Statement_map 
  /* Erase all statements (calls Statement destructor) */

  void reset()

  {

    hash_reset(&names_hash);

    hash_reset(&st_hash);

    my_hash_reset(&names_hash);

    my_hash_reset(&st_hash);

    last_found_statement= 0;

  }