bk commit into 5.0 tree (kaa:1.1993) BUG#13367

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1993 05/09/27 13:37:20 kaa@stripped +3 -0
  Fix for bug #13367, post-review changes

  innobase/trx/trx0sys.c
    1.35 05/09/27 13:37:15 kaa@stripped +0 -19
    Fix for bug #13367, post-review changes

  innobase/srv/srv0start.c
    1.85 05/09/27 13:37:15 kaa@stripped +1 -1
    Fix for bug #13367, post-review changes

  innobase/buf/buf0flu.c
    1.31 05/09/27 13:37:15 kaa@stripped +2 -2
    Fix for bug #13367, post-review changes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/mysql-5.0

--- 1.30/innobase/buf/buf0flu.c	2005-09-26 19:24:26 +04:00
+++ 1.31/innobase/buf/buf0flu.c	2005-09-27 13:37:15 +04:00
@@ -503,11 +503,11 @@
 #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);
-	} else if (srv_use_doublewrite_buf) {
+	} else {
 		buf_flush_post_to_doublewrite_buf(block);
 	}
 }

--- 1.84/innobase/srv/srv0start.c	2005-08-19 22:55:19 +04:00
+++ 1.85/innobase/srv/srv0start.c	2005-09-27 13:37:15 +04:00
@@ -1540,7 +1540,7 @@
 #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();

--- 1.34/innobase/trx/trx0sys.c	2005-07-26 15:21:32 +04:00
+++ 1.35/innobase/trx/trx0sys.c	2005-09-27 13:37:15 +04:00
@@ -126,22 +126,6 @@
 }
 
 /********************************************************************
-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 @@
 
 	fil_flush_file_spaces(FIL_TABLESPACE);
 	
-  if (!srv_use_doublewrite_buf)
-    trx_doublewrite_free();
-
 leave_func:
 	ut_free(unaligned_read_buf);
 }