diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
| commit | 84d0cda44c8fd13b3b88f7b90ec8fb755caef361 (patch) | |
| tree | bd5218816ba9b52d92e7f30d5d6e4c12b6153b87 /sql/item_func.cc | |
| parent | 27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99 (diff) | |
| parent | 44e0239396a0337fcdb455589f591dd42f2acd43 (diff) | |
| download | mariadb-git-84d0cda44c8fd13b3b88f7b90ec8fb755caef361.tar.gz | |
Merge mysql.com:/d2/hf/clean/my50-clean
into mysql.com:/d2/hf/common/my50-common
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.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 1a3416845a8..0eab370237d 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3388,7 +3388,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); |