Commit 9dc622e5 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
parents 51672e95 a4a2c720

libmysqld/lib_sql.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -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