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 | a4c3bc618bb83884a19dc157bc56d4e3d2432c22 (patch) | |
| tree | ea8cbc9d70015a17aad75df30e7d223476eaa4da /sql/slave.h | |
| parent | b2b055034c065307fca4dc04d00ce0c139b44808 (diff) | |
| download | mariadb-git-a4c3bc618bb83884a19dc157bc56d4e3d2432c22.tar.gz | |
WL#2360 Performance schema
Part IV: sql instrumentation
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sql/slave.h b/sql/slave.h index 69290ecac0a..421f838f188 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (C) 2000-2003 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 @@ -160,12 +160,17 @@ int start_slave_threads(bool need_slave_mutex, bool wait_for_start, inside the start_lock section, but at the same time we want a pthread_cond_wait() on start_cond,start_lock */ -int start_slave_thread(pthread_handler h_func, pthread_mutex_t* start_lock, - pthread_mutex_t *cond_lock, - pthread_cond_t* start_cond, - volatile uint *slave_running, - volatile ulong *slave_run_id, - Master_info* mi); +int start_slave_thread( +#ifdef HAVE_PSI_INTERFACE + PSI_thread_key thread_key, +#endif + pthread_handler h_func, + mysql_mutex_t *start_lock, + mysql_mutex_t *cond_lock, + mysql_cond_t *start_cond, + volatile uint *slave_running, + volatile ulong *slave_run_id, + Master_info *mi); /* If fd is -1, dump to NET */ int mysql_table_dump(THD* thd, const char* db, |