diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-06-06 13:19:29 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-06-06 13:19:29 +0200 |
| commit | 142a162c665704ce5b4d5b671d05a068661c088a (patch) | |
| tree | def1ebab09889a8f09a9fcd074c8a672689376af /sql/lock.cc | |
| parent | cbf4019a1b3ec82bdcd9a65db114908a920fb01c (diff) | |
| parent | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (diff) | |
| download | mariadb-git-142a162c665704ce5b4d5b671d05a068661c088a.tar.gz | |
manual merge from mysql-trunk-bugfixing
Conflicts:
Text conflict in mysql-test/r/archive.result
Contents conflict in mysql-test/r/innodb_bug38231.result
Text conflict in mysql-test/r/mdl_sync.result
Text conflict in mysql-test/suite/binlog/t/disabled.def
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
Text conflict in mysql-test/t/archive.test
Contents conflict in mysql-test/t/innodb_bug38231.test
Text conflict in mysql-test/t/mdl_sync.test
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_show.cc
Text conflict in sql/table.cc
Text conflict in sql/table.h
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index fbe15fde3b0..d35f2c359fb 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -533,20 +533,6 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table) } } -/* Downgrade all locks on a table to new WRITE level from WRITE_ONLY */ - -void mysql_lock_downgrade_write(THD *thd, TABLE *table, - thr_lock_type new_lock_type) -{ - MYSQL_LOCK *locked; - if ((locked = get_lock_data(thd, &table, 1, GET_LOCK_UNLOCK))) - { - for (uint i=0; i < locked->lock_count; i++) - thr_downgrade_write_lock(locked->locks[i], new_lock_type); - my_free((uchar*) locked,MYF(0)); - } -} - /** Abort all other threads waiting to get lock in table. */ |