database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

5.3 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-24 14:37:00 +01:00
parent db39910f08 c068b831ac
commit 3f28115e0e
35 changed files with 351 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_handler.cc
View File

@ -750,7 +750,7 @@ retry:
if (handler->lock->lock_count > 0)
{
bool lock_error;
int lock_error;
handler->lock->locks[0]->type= handler->lock->locks[0]->org_type;