BUG#5390 - problems with merge tables

Fix for merge from 4.1.

BUG#5390 - problems with merge tables
Fix for merge from 4.1.
692add61 · ingo@mysql.com · ab71bd7e · 692add61
Commit 692add61 authored Feb 20, 2006 by ingo@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sql/lock.cc sql/lock.cc +0 -2

No files found.
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -159,8 +159,6 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count,
    memcpy(sql_lock->locks + sql_lock->lock_count, sql_lock->locks,
           sql_lock->lock_count * sizeof(*sql_lock->locks));
    /* Lock on the copied half of the lock data array. */
-    if (thr_multi_lock(sql_lock->locks + sql_lock->lock_count,
-                       sql_lock->lock_count))
    rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(sql_lock->locks +
                                                     sql_lock->lock_count,
                                                     sql_lock->lock_count,