mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rurik.mysql.com:/home/igor/mysql-5.0

Browse source 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
This commit is contained in:
unknown 2005-09-27 08:24:19 -07:00
commit 6c2dad0dbe
6 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
innobase/buf/buf0flu.c
View file

@ -230,7 +230,7 @@ buf_flush_buffered_writes(void)
ulint len2; ulint len2;
ulint i; ulint i;
if (trx_doublewrite == NULL) { if (!srv_use_doublewrite_buf || trx_doublewrite == NULL) {
os_aio_simulated_wake_handler_threads(); os_aio_simulated_wake_handler_threads();
return; return;
@ -503,7 +503,7 @@ buf_flush_write_block_low(
#endif #endif
buf_flush_init_for_writing(block->frame, block->newest_modification, buf_flush_init_for_writing(block->frame, block->newest_modification,
block->space, block->offset); block->space, block->offset);
if (!trx_doublewrite) { if (!srv_use_doublewrite_buf || !trx_doublewrite) {
fil_io(OS_FILE_WRITE | OS_AIO_SIMULATED_WAKE_LATER, fil_io(OS_FILE_WRITE | OS_AIO_SIMULATED_WAKE_LATER,
FALSE, block->space, block->offset, 0, UNIV_PAGE_SIZE, FALSE, block->space, block->offset, 0, UNIV_PAGE_SIZE,
(void*)block->frame, (void*)block); (void*)block->frame, (void*)block);

4
innobase/include/trx0trx.h
View file

@ -61,8 +61,8 @@ Set detailed error message for the transaction. */
void void
trx_set_detailed_error( trx_set_detailed_error(
/*===================*/ /*===================*/
trx_t* trx, /* in: transaction struct */ trx_t* trx, /* in: transaction struct */
char* msg); /* in: detailed error message */ const char* msg); /* in: detailed error message */
/***************************************************************** /*****************************************************************
Set detailed error message for the transaction from a file. Note that the Set detailed error message for the transaction from a file. Note that the
file is rewinded before reading from it. */ file is rewinded before reading from it. */

2
innobase/srv/srv0start.c
View file

@ -1540,7 +1540,7 @@ NetWare. */
#endif #endif
sync_order_checks_on = TRUE; 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 */ /* Create the doublewrite buffer to a new tablespace */
trx_sys_create_doublewrite_buf(); trx_sys_create_doublewrite_buf();

19
innobase/trx/trx0sys.c
View file

@ -125,22 +125,6 @@ trx_doublewrite_init(
* sizeof(void*)); * 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 Marks the trx sys header when we have successfully upgraded to the >= 4.1.x
multiple tablespace format. */ multiple tablespace format. */
@ -529,9 +513,6 @@ trx_sys_doublewrite_init_or_restore_pages(
fil_flush_file_spaces(FIL_TABLESPACE); fil_flush_file_spaces(FIL_TABLESPACE);
if (!srv_use_doublewrite_buf)
trx_doublewrite_free();
leave_func: leave_func:
ut_free(unaligned_read_buf); ut_free(unaligned_read_buf);
} }

4
innobase/trx/trx0trx.c
View file

@ -58,8 +58,8 @@ Set detailed error message for the transaction. */
void void
trx_set_detailed_error( trx_set_detailed_error(
/*===================*/ /*===================*/
trx_t* trx, /* in: transaction struct */ trx_t* trx, /* in: transaction struct */
char* msg) /* in: detailed error message */ const char* msg) /* in: detailed error message */
{ {
ut_strlcpy(trx->detailed_error, msg, sizeof(trx->detailed_error)); ut_strlcpy(trx->detailed_error, msg, sizeof(trx->detailed_error));
} }

4
server-tools/instance-manager/portability.h
View file

@ -1,6 +1,10 @@
#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H #ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
#define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H #define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
#if defined(__SCO_DS) && !defined(SHUT_RDWR)
#define SHUT_RDWR 2
#endif
#ifdef __WIN__ #ifdef __WIN__
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf