diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 665100b69dfebe45e2d3b68116c6718560bf63b2 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/mdl.h | |
| parent | 5eed6cc55db0f99aff7845397a824fb2f5ef069e (diff) | |
| parent | 4e8d1c6bf30abfd45a993b058ff2a33d4671b73d (diff) | |
| download | mariadb-git-665100b69dfebe45e2d3b68116c6718560bf63b2.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/mdl.h')
| -rw-r--r-- | sql/mdl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mdl.h b/sql/mdl.h index d560f38ce0a..5eb86d2488b 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -716,7 +716,7 @@ extern "C" const char *set_thd_proc_info(THD *thd, const char *info, const char *calling_file, const unsigned int calling_line); #ifndef DBUG_OFF -extern pthread_mutex_t LOCK_open; +extern mysql_mutex_t LOCK_open; #endif #endif |