Commit fe3e77d8 authored by unknown's avatar unknown
Browse files

Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  127.(none):/home/osku/mysql/5.0/clean
parents c6240dcd 6fa0ed40

innobase/buf/buf0flu.c

+2 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ buf_flush_buffered_writes(void) 
	ulint		len2;

	ulint		i;



	if (trx_doublewrite == NULL) {

	if (!srv_use_doublewrite_buf || trx_doublewrite == NULL) {

		os_aio_simulated_wake_handler_threads();



		return;
@@ -503,7 +503,7 @@ buf_flush_write_block_low( 
#endif	

	buf_flush_init_for_writing(block->frame, block->newest_modification,

						block->space, block->offset);

	if (!trx_doublewrite) {

	if (!srv_use_doublewrite_buf || !trx_doublewrite) {

		fil_io(OS_FILE_WRITE | OS_AIO_SIMULATED_WAKE_LATER,

			FALSE, block->space, block->offset, 0, UNIV_PAGE_SIZE,

		 			(void*)block->frame, (void*)block);

innobase/srv/srv0start.c

+1 −1
Original line number Diff line number Diff line
@@ -1540,7 +1540,7 @@ NetWare. */ 
#endif

	sync_order_checks_on = TRUE;



        if (srv_use_doublewrite_buf && trx_doublewrite == NULL) {

        if (trx_doublewrite == NULL) {

		/* Create the doublewrite buffer to a new tablespace */



		trx_sys_create_doublewrite_buf();

innobase/trx/trx0sys.c

+0 −19
Original line number Diff line number Diff line
@@ -125,22 +125,6 @@ trx_doublewrite_init( 
					* sizeof(void*));

}



/********************************************************************

Frees the doublewrite buffer. */

static

void

trx_doublewrite_free(void)

/*======================*/

{

  mutex_free(&(trx_doublewrite->mutex));



  mem_free(trx_doublewrite->buf_block_arr);

  ut_free(trx_doublewrite->write_buf_unaligned);



  mem_free(trx_doublewrite);

  trx_doublewrite = NULL;

}



/********************************************************************

Marks the trx sys header when we have successfully upgraded to the >= 4.1.x

multiple tablespace format. */
@@ -529,9 +513,6 @@ trx_sys_doublewrite_init_or_restore_pages( 


	fil_flush_file_spaces(FIL_TABLESPACE);

	

  if (!srv_use_doublewrite_buf)

    trx_doublewrite_free();



leave_func:

	ut_free(unaligned_read_buf);

}