mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge trift2.:/MySQL/M50/merge-5.0

Browse source 
into  trift2.:/MySQL/M50/push-5.0
This commit is contained in:
joerg@trift2. 2007-06-13 14:52:45 +02:00
commit f004ab37ef
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmysqld/lib_sql.cc
View file

@ -590,7 +590,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;

2
sql/item_func.cc
View file

@ -3578,7 +3578,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