1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge adventure.(none):/home/thek/Development/cpp/bug32436/my51-bug32436

Browse Source 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown 2007-11-26 15:59:09 +01:00
commit 1522ef3f21
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/item_func.cc
View File

@ -3721,13 +3721,12 @@ longlong Item_func_sleep::val_int()
break; break;
error= 0; error= 0;
} }
pthread_mutex_unlock(&LOCK_user_locks);
pthread_mutex_lock(&thd->mysys_var->mutex); pthread_mutex_lock(&thd->mysys_var->mutex);
thd->mysys_var->current_mutex= 0; thd->mysys_var->current_mutex= 0;
thd->mysys_var->current_cond= 0; thd->mysys_var->current_cond= 0;
pthread_mutex_unlock(&thd->mysys_var->mutex); pthread_mutex_unlock(&thd->mysys_var->mutex);
pthread_mutex_unlock(&LOCK_user_locks);
pthread_cond_destroy(&cond); pthread_cond_destroy(&cond);
return test(!error); // Return 1 killed return test(!error); // Return 1 killed