diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-13 10:39:15 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-13 10:39:15 +0400 |
| commit | 28f6e132996b90d1ce6407aee9f82952c35eb18e (patch) | |
| tree | d66cf03fbaef4b0ffc1468ba9813c047f2e80a7b /sql/item_func.cc | |
| parent | 93b36e8e0524a931809927ab48723bf148a29e1c (diff) | |
| download | mariadb-git-28f6e132996b90d1ce6407aee9f82952c35eb18e.tar.gz | |
embedded-mode tests fixed
libmysqld/examples/test-run:
mysql_embedded should be run here
libmysqld/lib_sql.cc:
thd->real_id setup added
bootstrap check added
mysql-test/t/innodb.test:
paths can be different in embedded server - replace_result added
sql/item_func.cc:
we should compare real_id-s in embedded server
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 fafefd460f9..db756c1c529 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2238,7 +2238,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); |