summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.h
diff options
context:
space:
mode:
authorjan@hundin.mysql.fi <>2004-12-09 11:20:50 +0200
committerjan@hundin.mysql.fi <>2004-12-09 11:20:50 +0200
commit49c0044a2f6159512e5e40b88104407abcce60de (patch)
tree465f1cf5128d68051a4742439bf4f69d5975b276 /sql/ha_innodb.h
parentdafb2969c90860676c521edda12377e7b4dd3eb2 (diff)
parentd6effde5d0d727d6f010314cdf422908bee10f98 (diff)
downloadmariadb-git-49c0044a2f6159512e5e40b88104407abcce60de.tar.gz
Content merge.
Diffstat (limited to 'sql/ha_innodb.h')
-rw-r--r--sql/ha_innodb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index b3b8d1a29e8..214e905a327 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -150,6 +150,7 @@ class ha_innobase: public handler
int discard_or_import_tablespace(my_bool discard);
int extra(enum ha_extra_function operation);
int external_lock(THD *thd, int lock_type);
+ int transactional_table_lock(THD *thd, int lock_type);
int start_stmt(THD *thd);
void position(byte *record);