summaryrefslogtreecommitdiff
path: root/sql/lock.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2014-12-02 14:54:30 +0400
committerSergey Vojtovich <svoj@mariadb.org>2014-12-05 11:01:49 +0400
commitb4ec230917a50cbc1e406f5175189c8359bcb9a0 (patch)
tree1bc8664e0eccdab6c5e57a86ee76d02a200eb92c /sql/lock.h
parent9bc5cec0f115d7d0c277a49b91b96109560280f4 (diff)
downloadmariadb-git-b4ec230917a50cbc1e406f5175189c8359bcb9a0.tar.gz
MDEV-7004 - Merge scalability fixes from 10.0-power
Preallocate locks on THD mem_root to avoid expensive malloc.
Diffstat (limited to 'sql/lock.h')
-rw-r--r--sql/lock.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/lock.h b/sql/lock.h
index ca2f267f3d5..341d7a20f9f 100644
--- a/sql/lock.h
+++ b/sql/lock.h
@@ -28,7 +28,8 @@ typedef struct st_mysql_lock MYSQL_LOCK;
MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count, uint flags);
bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags);
-void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock= 1);
+void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock);
+void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock);
void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock);
void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count);
void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table);