diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-15 21:45:22 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-15 21:45:22 +0300 |
| commit | 7a6e5c3f4cbbfeabd370e074ad03fb7dae90b964 (patch) | |
| tree | c5bdf39edfe6126050810bb9269e5bb4fc8cf16d /sql/sql_class.h | |
| parent | 3394cbf72cc09ca4735f88c2669ccd853134dfa8 (diff) | |
| parent | fd433cfb96adcbb013b27838cd80576dff92989d (diff) | |
| download | mariadb-git-7a6e5c3f4cbbfeabd370e074ad03fb7dae90b964.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 4bfd3e66438..b99c25782e0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2098,6 +2098,12 @@ public: proc_info = msg; return old_msg; } + inline const char* enter_cond(mysql_cond_t *cond, mysql_mutex_t *mutex, + const char *msg) + { + /* TO BE REMOVED: temporary helper, to help with merges */ + return enter_cond(&cond->m_cond, &mutex->m_mutex, msg); + } inline void exit_cond(const char* old_msg) { /* |