mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Applied innodb-5.1-ss492 snapshot.

Browse source 
* Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.
This commit is contained in:
aivanov@mysql.com 2006-04-26 08:30:37 +04:00
commit 0eb36757a8
12 changed files with 40 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

66
storage/innobase/srv/srv0srv.c
View file

@ -362,30 +362,6 @@ ibool srv_print_innodb_lock_monitor = FALSE;
ibool srv_print_innodb_tablespace_monitor = FALSE;
ibool srv_print_innodb_table_monitor = FALSE;
/* The parameters below are obsolete: */
ibool srv_print_parsed_sql = FALSE;
ulint srv_sim_disk_wait_pct = ULINT_MAX;
ulint srv_sim_disk_wait_len = ULINT_MAX;
ibool srv_sim_disk_wait_by_yield = FALSE;
ibool srv_sim_disk_wait_by_wait = FALSE;
ibool srv_measure_contention = FALSE;
ibool srv_measure_by_spin = FALSE;
ibool srv_test_extra_mutexes = FALSE;
ibool srv_test_nocache = FALSE;
ibool srv_test_cache_evict = FALSE;
ibool srv_test_sync = FALSE;
ulint srv_test_n_threads = ULINT_MAX;
ulint srv_test_n_loops = ULINT_MAX;
ulint srv_test_n_free_rnds = ULINT_MAX;
ulint srv_test_n_reserved_rnds = ULINT_MAX;
ulint srv_test_array_size = ULINT_MAX;
ulint srv_test_n_mutexes = ULINT_MAX;
/* Array of English strings describing the current state of an
i/o handler thread */
@ -911,10 +887,6 @@ srv_init(void)
srv_meter_foreground[i] = 250;
}
srv_sys->operational = os_event_create(NULL);
ut_a(srv_sys->operational);
UT_LIST_INIT(srv_sys->tasks);
/* create dummy table and index for old-style infimum and supremum */
@ -1847,11 +1819,7 @@ srv_export_innodb_status(void)
A thread which wakes up threads whose lock wait may have lasted too long.
This also prints the info output by various InnoDB monitors. */
#ifndef __WIN__
void*
#else
ulint
#endif
os_thread_ret_t
srv_lock_timeout_and_monitor_thread(
/*================================*/
/* out: a dummy parameter */
@ -2023,22 +1991,15 @@ exit_func:
thread should always use that to exit and not use return() to exit. */
os_thread_exit(NULL);
#ifndef __WIN__
return(NULL);
#else
return(0);
#endif
OS_THREAD_DUMMY_RETURN;
}
/*************************************************************************
A thread which prints warnings about semaphore waits which have lasted
too long. These can be used to track bugs which cause hangs. */
#ifndef __WIN__
void*
#else
ulint
#endif
os_thread_ret_t
srv_error_monitor_thread(
/*=====================*/
/* out: a dummy parameter */
@ -2120,11 +2081,7 @@ loop:
os_thread_exit(NULL);
#ifndef __WIN__
return(NULL);
#else
return(0);
#endif
OS_THREAD_DUMMY_RETURN;
}
/***********************************************************************
@ -2169,11 +2126,7 @@ srv_wake_master_thread(void)
/*************************************************************************
The master thread controlling the server. */
#ifndef __WIN__
void*
#else
ulint
#endif
os_thread_ret_t
srv_master_thread(
/*==============*/
/* out: a dummy parameter */
@ -2212,7 +2165,6 @@ srv_master_thread(
mutex_exit(&kernel_mutex);
os_event_set(srv_sys->operational);
loop:
/*****************************************************************/
/* ---- When there is database activity by users, we cycle in this
@ -2619,10 +2571,6 @@ suspend_thread:
os_thread_exit(NULL);
#ifndef __WIN__
return(NULL); /* Not reached */
#else
return(0);
#endif
OS_THREAD_DUMMY_RETURN;
}
#endif /* !UNIV_HOTBACKUP */

17
storage/innobase/srv/srv0start.c
View file

@ -426,11 +426,7 @@ srv_parse_log_group_home_dirs(
I/o-handler thread function. */
static
#ifndef __WIN__
void*
#else
ulint
#endif
os_thread_ret_t
io_handler_thread(
/*==============*/
void* arg)
@ -459,11 +455,7 @@ io_handler_thread(
os_thread_exit(NULL);
#ifndef __WIN__
return(NULL); /* Not reached */
#else
return(0);
#endif
OS_THREAD_DUMMY_RETURN;
}
#endif /* !UNIV_HOTBACKUP */
@ -1540,11 +1532,6 @@ NetWare. */
}
#endif /* UNIV_LOG_ARCHIVE */
if (srv_measure_contention) {
/* os_thread_create(&test_measure_cont, NULL, thread_ids +
SRV_MAX_N_IO_THREADS); */
}
/* fprintf(stderr, "Max allowed record size %lu\n",
page_get_free_space_of_empty() / 2); */