diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-05 13:17:54 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-05 13:17:54 +0100 |
| commit | 5e7b949e61f4330e27013c8ec81fa3d450e5dce6 (patch) | |
| tree | 0e7e618222457aa528a57a03250dc458beac37ea /sql/lock.cc | |
| parent | cff0175d2a6717d04f2257257a2566d66f565deb (diff) | |
| download | mariadb-git-5e7b949e61f4330e27013c8ec81fa3d450e5dce6.tar.gz | |
Fix crash due to wrong my_error() call (5.5 after-merge fix).
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 631e5018cf3..57a9e753ce7 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -331,7 +331,7 @@ end: mysql_unlock_tables(thd, sql_lock, 0); rc= 1; } - else if (rc) + else if (rc > 1) my_error(rc, MYF(0)); thd->set_time_after_lock(); |