diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-11 15:36:41 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-11 15:36:41 +0200 |
| commit | 050c004f5e6f152f5c4cdadda8a15e01d2f07a9a (patch) | |
| tree | f5828daced42ff651d5f822af17844154fb9ffd1 /sql/lock.cc | |
| parent | e63b5546c597f65696868eaf69159107bc4a8e44 (diff) | |
| parent | 2eaa76b84426b19f8574876ad1fa85ae6cfe3196 (diff) | |
| download | mariadb-git-050c004f5e6f152f5c4cdadda8a15e01d2f07a9a.tar.gz | |
Merge with 5.1
Fixes to get Aria handler tests to work.
Fixes LP#697597 "HANDLER + Aria asserts in maria-5.3-handler"
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 49f0cfdfa90..4cab521fada 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -84,7 +84,6 @@ extern HASH open_cache; -static void reset_lock_data(MYSQL_LOCK *sql_lock, bool unlock); static int lock_external(THD *thd, TABLE **table,uint count); static int unlock_external(THD *thd, TABLE **table,uint count); static void print_lock_error(int error, const char *); @@ -978,7 +977,7 @@ MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, get_store_lock(). */ -static void reset_lock_data(MYSQL_LOCK *sql_lock, bool unlock) +void reset_lock_data(MYSQL_LOCK *sql_lock, bool unlock) { THR_LOCK_DATA **ldata; THR_LOCK_DATA **ldata_end; |