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 | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (patch) | |
tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/mdl.h | |
parent | ca2b08e437d4c5538b40aa61fa44f68ddd74bc42 (diff) | |
parent | 92630be0ee81604ec47cb8c7e9ab016e5449dc4d (diff) | |
download | mariadb-git-2c6015e8dc962bef8f353af920581d9b6bd7fd82.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 |