diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-12-21 07:49:38 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-12-21 07:49:38 +0200 |
| commit | 52d080f09979deb2063a8010feee3b925a3d7938 (patch) | |
| tree | 5d3767a8558fd05da17b5d4e3f361ef643d3a9b8 /server-tools/instance-manager/thread_registry.h | |
| parent | 868266f1b1ec0adde75db2887bbc73306441caeb (diff) | |
| parent | 272b380b459633454ad0ffbd877a986e06196216 (diff) | |
| download | mariadb-git-52d080f09979deb2063a8010feee3b925a3d7938.tar.gz | |
Content merge.
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
innobase/trx/trx0roll.c:
Auto merged.
Diffstat (limited to 'server-tools/instance-manager/thread_registry.h')
| -rw-r--r-- | server-tools/instance-manager/thread_registry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/thread_registry.h b/server-tools/instance-manager/thread_registry.h index 0836f44345d..a25c692b77f 100644 --- a/server-tools/instance-manager/thread_registry.h +++ b/server-tools/instance-manager/thread_registry.h @@ -100,7 +100,7 @@ private: bool shutdown_in_progress; pthread_mutex_t LOCK_thread_registry; pthread_cond_t COND_thread_registry_is_empty; - pid_t sigwait_thread_pid; + pthread_t sigwait_thread_pid; }; |