Fix crash due to wrong my_error() call (5.5 after-merge fix).

da9bcee2 · unknown · 5d342102 · da9bcee2
Commit da9bcee2 authored Dec 05, 2011 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/lock.cc sql/lock.cc +1 -1

No files found.
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -331,7 +331,7 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags)
      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();