1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged patch from Percona to get proper fix for compilation issue of srv0srv.c on Solaris

Browse Source 
sql/sql_cache.cc:
  Fixed wrong comment
This commit is contained in:
Michael Widenius 2010-01-12 19:31:11 +02:00
parent fafe55c17a
commit 2cc3fc2713
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_cache.cc
View File

@ -1306,8 +1306,8 @@ end:
to the user. to the user.
RESULTS RESULTS
1 Query was not cached. 0 Query was not cached.
0 The query was cached and user was sent the result. 1 The query was cached and user was sent the result.
-1 The query was cached but we didn't have rights to use it. -1 The query was cached but we didn't have rights to use it.
No error is sent to the client yet. No error is sent to the client yet.

14
storage/xtradb/srv/srv0srv.c
View File

@ -81,7 +81,6 @@ Created 10/8/1995 Heikki Tuuri
#include "ut0mem.h" #include "ut0mem.h"
#include "ut0ut.h" #include "ut0ut.h"
#include "os0proc.h" #include "os0proc.h"
#include "os0sync.h"
#include "mem0mem.h" #include "mem0mem.h"
#include "mem0pool.h" #include "mem0pool.h"
#include "sync0sync.h" #include "sync0sync.h"
@ -103,6 +102,10 @@ Created 10/8/1995 Heikki Tuuri
#include "row0mysql.h" #include "row0mysql.h"
#include "ha_prototypes.h" #include "ha_prototypes.h"
#include "trx0i_s.h" #include "trx0i_s.h"
#include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */
/* prototypes for new functions added to ha_innodb.cc */
ibool innobase_get_slow_log();
/* This is set to TRUE if the MySQL user has set it in MySQL; currently /* This is set to TRUE if the MySQL user has set it in MySQL; currently
affects only FOREIGN KEY definition parsing */ affects only FOREIGN KEY definition parsing */
@ -162,6 +165,7 @@ UNIV_INTERN ulint* srv_data_file_sizes = NULL;
UNIV_INTERN ibool srv_extra_undoslots = FALSE; UNIV_INTERN ibool srv_extra_undoslots = FALSE;
UNIV_INTERN ibool srv_fast_recovery = FALSE; UNIV_INTERN ibool srv_fast_recovery = FALSE;
UNIV_INTERN ibool srv_recovery_stats = FALSE;
UNIV_INTERN ibool srv_use_purge_thread = FALSE; UNIV_INTERN ibool srv_use_purge_thread = FALSE;
@ -1077,7 +1081,7 @@ UNIV_INTERN ulong srv_max_purge_lag = 0;
Puts an OS thread to wait if there are too many concurrent threads Puts an OS thread to wait if there are too many concurrent threads
(>= srv_thread_concurrency) inside InnoDB. The threads wait in a FIFO queue. */ (>= srv_thread_concurrency) inside InnoDB. The threads wait in a FIFO queue. */
#ifdef INNODB_RW_LOCKS_USE_ATOMICS #ifdef HAVE_ATOMIC_BUILTINS
static void static void
enter_innodb_with_tickets(trx_t* trx) enter_innodb_with_tickets(trx_t* trx)
{ {
@ -1175,7 +1179,7 @@ srv_conc_enter_innodb(
return; return;
} }
#ifdef INNODB_RW_LOCKS_USE_ATOMICS #ifdef HAVE_ATOMIC_BUILTINS
if (srv_thread_concurrency_timer_based) { if (srv_thread_concurrency_timer_based) {
srv_conc_enter_innodb_timer_based(trx); srv_conc_enter_innodb_timer_based(trx);
return; return;
@ -1325,7 +1329,7 @@ srv_conc_force_enter_innodb(
} }
ut_ad(srv_conc_n_threads >= 0); ut_ad(srv_conc_n_threads >= 0);
#ifdef INNODB_RW_LOCKS_USE_ATOMICS #ifdef HAVE_ATOMIC_BUILTINS
if (srv_thread_concurrency_timer_based) { if (srv_thread_concurrency_timer_based) {
os_atomic_increment_lint(&srv_conc_n_threads, 1); os_atomic_increment_lint(&srv_conc_n_threads, 1);
trx->declared_to_be_inside_innodb = TRUE; trx->declared_to_be_inside_innodb = TRUE;
@ -1366,7 +1370,7 @@ srv_conc_force_exit_innodb(
return; return;
} }
#ifdef INNODB_RW_LOCKS_USE_ATOMICS #ifdef HAVE_ATOMIC_BUILTINS
if (srv_thread_concurrency_timer_based) { if (srv_thread_concurrency_timer_based) {
srv_conc_exit_innodb_timer_based(trx); srv_conc_exit_innodb_timer_based(trx);
return; return;