diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:37:42 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:37:42 +0400 |
| commit | 62576974dec88d0c663e7e8a93065e05e9ca484a (patch) | |
| tree | f29ba6a7ce3abf7a761ab6b37addc856324d4d2e /sql/item_func.cc | |
| parent | fc9642b46dcd928a2116f04adf1bb24fb179f6cb (diff) | |
| parent | ca98fb63ad79340e256514c330a1ad01e7865119 (diff) | |
| download | mariadb-git-62576974dec88d0c663e7e8a93065e05e9ca484a.tar.gz | |
Merge mysql.com:/d2/hf/clean/my41-clean
into mysql.com:/d2/hf/common/my41-common
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 117ae19137b..635c6b4c6d6 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2239,7 +2239,11 @@ longlong Item_func_release_lock::val_int() } else { +#ifdef EMBEDDED_LIBRARY + if (ull->locked && pthread_equal(current_thd->real_id,ull->thread)) +#else if (ull->locked && pthread_equal(pthread_self(),ull->thread)) +#endif { result=1; // Release is ok item_user_lock_release(ull); |