Commit 36d7f7ec authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1

parents 2b71fc64 4e195cbd

include/config-netware.h

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ extern "C" { 
/* On NetWare, stack grows towards lower address*/

#define STACK_DIRECTION -1



/* On NetWare, we need to set stack size for threads, otherwise default 16K is used */

#define NW_THD_STACKSIZE 65536



/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1

include/hash.h

+10 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ typedef void (*hash_free_key)(void *); 


typedef struct st_hash {

  uint key_offset,key_length;		/* Length of key if const length */

  uint records,blength,current_record;

  uint records, blength;

  uint flags;

  DYNAMIC_ARRAY array;				/* Place for hash_keys */

  hash_get_key get_key;
@@ -41,6 +41,9 @@ typedef struct st_hash { 
  CHARSET_INFO *charset;

} HASH;



/* A search iterator state */

typedef uint HASH_SEARCH_STATE;



#define hash_init(A,B,C,D,E,F,G,H) _hash_init(A,B,C,D,E,F,G, H CALLER_INFO)

my_bool _hash_init(HASH *hash, CHARSET_INFO *charset,

		   uint default_array_elements, uint key_offset,
@@ -49,12 +52,15 @@ my_bool _hash_init(HASH *hash, CHARSET_INFO *charset, 
void hash_free(HASH *tree);

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);

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

gptr hash_first(const HASH *info, const byte *key, uint length,

                HASH_SEARCH_STATE *state);

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

               HASH_SEARCH_STATE *state);

my_bool my_hash_insert(HASH *info,const byte *data);

my_bool hash_delete(HASH *hash,byte *record);

my_bool hash_update(HASH *hash,byte *record,byte *old_key,uint old_key_length);

void hash_replace(HASH *hash, uint idx, byte *new_row);

void hash_replace(HASH *hash, HASH_SEARCH_STATE *state, byte *new_row);

my_bool hash_check(HASH *hash);			/* Only in debug library */



#define hash_clear(H) bzero((char*) (H),sizeof(*(H)))

include/sha1.h

+3 −3
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ typedef struct SHA1_CONTEXT 


C_MODE_START



int sha1_reset( SHA1_CONTEXT* );

int sha1_input( SHA1_CONTEXT*, const uint8 *, unsigned int );

int sha1_result( SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE] );

int mysql_sha1_reset(SHA1_CONTEXT*);

int mysql_sha1_input(SHA1_CONTEXT*, const uint8 *, unsigned int);

int mysql_sha1_result(SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE]);



C_MODE_END

innobase/os/os0thread.c

+9 −0
Original line number Diff line number Diff line
@@ -147,6 +147,15 @@ os_thread_create( 
          "InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);

		 exit(1);

	}

#endif

#ifdef __NETWARE__

	ret = pthread_attr_setstacksize(&attr,

					(size_t) NW_THD_STACKSIZE);

        if (ret) {

	         fprintf(stderr,

          "InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);

		 exit(1);

	}

#endif

	os_mutex_enter(os_sync_mutex);

	os_thread_count++;

mysql-test/include/have_euckr.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_euckr.require

disable_query_log;

show collation like "euckr_korean_ci";

enable_query_log;