diff options
| author | joerg@trift2. <> | 2007-06-13 13:35:04 +0200 |
|---|---|---|
| committer | joerg@trift2. <> | 2007-06-13 13:35:04 +0200 |
| commit | a4a2c7202cb8accc24565007394a3c8d0d638e37 (patch) | |
| tree | 81f56cbe62d39f6475d234b100935ca728f094a1 | |
| parent | 160b784a49f041c4bca61bc7c763a31e886a89b9 (diff) | |
| parent | 018a5d403b09d42da97b070a7429e5b94a74648b (diff) | |
| download | mariadb-git-a4a2c7202cb8accc24565007394a3c8d0d638e37.tar.gz | |
Merge trift2.:/MySQL/M41/tmp-4.1
into trift2.:/MySQL/M41/push-4.1
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | sql/item_func.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 9ee8d48eec4..7f2059db7cd 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -540,7 +540,7 @@ void *create_embedded_thd(int client_flag) thd->set_time(); thd->init_for_queries(); thd->client_capabilities= client_flag; - thd->real_id= (pthread_t) thd; + thd->real_id= (pthread_t)thd->thread_id; thd->db= NULL; thd->db_length= 0; diff --git a/sql/item_func.cc b/sql/item_func.cc index 12bb6571369..f71297515d6 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2243,7 +2243,7 @@ longlong Item_func_release_lock::val_int() else { #ifdef EMBEDDED_LIBRARY - if (ull->locked && pthread_equal(current_thd->real_id,ull->thread)) + if (ull->locked && (current_thd->real_id == ull->thread)) #else if (ull->locked && pthread_equal(pthread_self(),ull->thread)) #endif |