Commit ffe18e48 authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents f72f6467 5949f901

include/my_pthread.h

+7 −5
Original line number Diff line number Diff line
@@ -527,6 +527,8 @@ extern int my_rwlock_destroy( my_rw_lock_t * ); 
extern int my_rw_rdlock(my_rw_lock_t *);

extern int my_rw_wrlock(my_rw_lock_t *);

extern int my_rw_unlock(my_rw_lock_t *);

extern int my_rw_tryrdlock(my_rw_lock_t *);

extern int my_rw_trywrlock(my_rw_lock_t *);

#endif /* USE_MUTEX_INSTEAD_OF_RW_LOCKS */



#define GETHOSTBYADDR_BUFF_SIZE 2048

innobase/srv/srv0start.c

+2 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,8 @@ innobase_shutdown_for_mysql(void) 
		srv_conc_n_threads);

	}

	

#ifdef NOT_WORKING_YET

	ut_free_all_mem();

	

#endif	

	return((int) DB_SUCCESS);

}

myisam/mi_check.c

+13 −3
Original line number Diff line number Diff line
@@ -2503,6 +2503,10 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key) 
    (info->s->rec_reflength+ 

     _mi_make_key(info, sort_param->key, (uchar*) key,

		  sort_param->record, sort_param->filepos));

#ifdef HAVE_purify

  bzero(key+sort_param->real_key_length,

	(sort_param->key_length-sort_param->real_key_length));

#endif

  DBUG_RETURN(sort_write_record(sort_param));

} /* sort_key_read */
@@ -2536,8 +2540,14 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) 
    wptr=(FT_WORD*)(sort_param->wordptr);

  }



  sort_param->real_key_length=info->s->rec_reflength+_ft_make_key(info,

                              sort_param->key,key,wptr++,sort_param->filepos);

  sort_param->real_key_length=(info->s->rec_reflength+

			       _ft_make_key(info, sort_param->key,

					    key, wptr++, sort_param->filepos));

#ifdef HAVE_purify

  if (sort_param->key_length > sort_param->real_key_length)

    bzero(key+sort_param->real_key_length,

	  (sort_param->key_length-sort_param->real_key_length));

#endif

  if (!wptr->pos)

  {

    my_free((char*) sort_param->wordlist, MYF(0));
@@ -2546,10 +2556,10 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) 
  else

    sort_param->wordptr=(void*)wptr;





  DBUG_RETURN(error);

} /* sort_ft_key_read */





	/* Read next record from file using parameters in sort_info */

	/* Return -1 if end of file, 0 if ok and > 0 if error */

mysql-test/r/myisam.result

+3 −0
Original line number Diff line number Diff line
@@ -96,4 +96,7 @@ INSERT INTO t1 (post_text) VALUES ('ceci est un test'),('ceci est un test'),('ce 
REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

mysql-test/t/myisam.test

+1 −1
Original line number Diff line number Diff line
@@ -91,5 +91,5 @@ CREATE TABLE `t1` ( 
INSERT INTO t1 (post_text) VALUES ('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test');



REPAIR TABLE t1;

CHECK TABLE t1;

drop table t1;