diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-01-06 22:42:07 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-01-06 22:42:07 -0700 |
| commit | 3d915225611a921fad03934e58bf281b48fc15b0 (patch) | |
| tree | ea8cbc9d70015a17aad75df30e7d223476eaa4da /sql/sql_cache.h | |
| parent | 4b559b912f5a3aa02a226fdacddaa3b80a8ade42 (diff) | |
| download | mariadb-git-3d915225611a921fad03934e58bf281b48fc15b0.tar.gz | |
WL#2360 Performance schema
Part IV: sql instrumentation
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index 33e535b2580..9d1f32d6ef1 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2006 MySQL AB +/* Copyright (C) 2001-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -137,7 +137,7 @@ struct Query_cache_block struct Query_cache_query { ulonglong limit_found_rows; - rw_lock_t lock; + mysql_rwlock_t lock; Query_cache_block *res; Query_cache_tls *wri; ulong len; @@ -277,7 +277,7 @@ private: #ifndef DBUG_OFF my_thread_id m_cache_lock_thread_id; #endif - pthread_cond_t COND_cache_status_changed; + mysql_cond_t COND_cache_status_changed; enum Cache_lock_status { UNLOCKED, LOCKED_NO_WAIT, LOCKED }; Cache_lock_status m_cache_lock_status; @@ -302,7 +302,7 @@ protected: is other threads that were going to do cache flush---they'll wait till the end of a flush operation. */ - pthread_mutex_t structure_guard_mutex; + mysql_mutex_t structure_guard_mutex; uchar *cache; // cache memory Query_cache_block *first_block; // physical location block list Query_cache_block *queries_blocks; // query list (LIFO) |