summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-19 14:43:32 +0300
committerunknown <monty@donna.mysql.fi>2001-04-19 14:43:32 +0300
commitdcedfad3c560de2b328e826d801dbe11560a52f2 (patch)
treefcdeec62c24b863cfe8fe65bb23158d45002f726 /innobase/include
parenteecdc32be6bd65afe803dceaaaca2e4ea501ec00 (diff)
downloadmariadb-git-dcedfad3c560de2b328e826d801dbe11560a52f2.tar.gz
Portability fixes
Docs/manual.texi: Updated mysqld-max section configure.in: Version change innobase/configure.in: Don't compile with -g when not using debugging (No optimization on Linux-Alpha) innobase/ib_config.h.in: config file innobase/ib_config.h: config file innobase/include/que0que.h: Can't inline this on SCO innobase/include/que0que.ic: Can't inline this on SCO innobase/include/sync0sync.h: Fix for Mac OS X innobase/que/que0que.c: Added functions that can't be inlined on SCO
Diffstat (limited to 'innobase/include')
-rw-r--r--innobase/include/que0que.h2
-rw-r--r--innobase/include/que0que.ic46
-rw-r--r--innobase/include/sync0sync.h1
3 files changed, 1 insertions, 48 deletions
diff --git a/innobase/include/que0que.h b/innobase/include/que0que.h
index bd21a9801aa..4cbd888ba1d 100644
--- a/innobase/include/que0que.h
+++ b/innobase/include/que0que.h
@@ -117,7 +117,6 @@ que_thr_stop(
/**************************************************************************
Moves a thread from another state to the QUE_THR_RUNNING state. Increments
the n_active_thrs counters of the query graph and transaction. */
-UNIV_INLINE
void
que_thr_move_to_run_state_for_mysql(
/*================================*/
@@ -126,7 +125,6 @@ que_thr_move_to_run_state_for_mysql(
/**************************************************************************
A patch for MySQL used to 'stop' a dummy query thread used in MySQL
select, when there is no error or lock wait. */
-UNIV_INLINE
void
que_thr_stop_for_mysql_no_error(
/*============================*/
diff --git a/innobase/include/que0que.ic b/innobase/include/que0que.ic
index e19198aad0e..ae4ed10560f 100644
--- a/innobase/include/que0que.ic
+++ b/innobase/include/que0que.ic
@@ -256,49 +256,3 @@ que_graph_is_select(
return(FALSE);
}
-
-/**************************************************************************
-Moves a thread from another state to the QUE_THR_RUNNING state. Increments
-the n_active_thrs counters of the query graph and transaction if thr was
-not active. */
-UNIV_INLINE
-void
-que_thr_move_to_run_state_for_mysql(
-/*================================*/
- que_thr_t* thr, /* in: an query thread */
- trx_t* trx) /* in: transaction */
-{
- if (!thr->is_active) {
-
- (thr->graph)->n_active_thrs++;
-
- trx->n_active_thrs++;
-
- thr->is_active = TRUE;
-
- ut_ad((thr->graph)->n_active_thrs == 1);
- ut_ad(trx->n_active_thrs == 1);
- }
-
- thr->state = QUE_THR_RUNNING;
-}
-
-/**************************************************************************
-A patch for MySQL used to 'stop' a dummy query thread used in MySQL
-select, when there is no error or lock wait. */
-UNIV_INLINE
-void
-que_thr_stop_for_mysql_no_error(
-/*============================*/
- que_thr_t* thr, /* in: query thread */
- trx_t* trx) /* in: transaction */
-{
- ut_ad(thr->state == QUE_THR_RUNNING);
-
- thr->state = QUE_THR_COMPLETED;
-
- thr->is_active = FALSE;
- (thr->graph)->n_active_thrs--;
-
- trx->n_active_thrs--;
-}
diff --git a/innobase/include/sync0sync.h b/innobase/include/sync0sync.h
index f22cce17a1a..03dd45816aa 100644
--- a/innobase/include/sync0sync.h
+++ b/innobase/include/sync0sync.h
@@ -55,6 +55,7 @@ Calling this function is obligatory only if the memory buffer containing
the mutex is freed. Removes a mutex object from the mutex list. The mutex
is checked to be in the reset state. */
+#undef mutex_free /* Fix for MacOS X */
void
mutex_free(
/*=======*/