diff options
| author | ingo@mysql.com <> | 2006-02-20 18:04:50 +0100 |
|---|---|---|
| committer | ingo@mysql.com <> | 2006-02-20 18:04:50 +0100 |
| commit | 692add617f97855a9136f1d1f28c25b96635c2e9 (patch) | |
| tree | 27733663aeec1190810214657feaf3e2a079bd36 /sql | |
| parent | ab71bd7ee5b6563bff0a351e8459c1d2e9667f77 (diff) | |
| download | mariadb-git-692add617f97855a9136f1d1f28c25b96635c2e9.tar.gz | |
BUG#5390 - problems with merge tables
Fix for merge from 4.1.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 22c3b03f8c1..01cdca0b6ee 100644 --- 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, |