diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-24 14:37:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-24 14:37:00 +0100 |
| commit | 3f28115e0ee810de2772fdc69d6965058a0b5d2f (patch) | |
| tree | a14bb01c316d353c5b6c217b7198cf4148ae50e5 /sql/sql_handler.cc | |
| parent | db39910f080534159ce8c7d55fa458365de7c3f3 (diff) | |
| parent | c068b831aca6334c6dea01fd9ff54b6140a52ef6 (diff) | |
| download | mariadb-git-3f28115e0ee810de2772fdc69d6965058a0b5d2f.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 0439a3c8265..c67618f0680 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -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; |