diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-12-09 11:20:50 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-12-09 11:20:50 +0200 |
| commit | 101fdd4eda0ad9af09939cafb042fda4812bcd1e (patch) | |
| tree | 465f1cf5128d68051a4742439bf4f69d5975b276 /sql/ha_innodb.h | |
| parent | 89e77b65cd6999d1b6567f1744fbd35659d9d7b7 (diff) | |
| parent | 0f99fe728e9d32d8b6bf098775d1ef86235f8a47 (diff) | |
| download | mariadb-git-101fdd4eda0ad9af09939cafb042fda4812bcd1e.tar.gz | |
Content merge.
innobase/include/lock0lock.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/handler.h:
content merge.
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 1 |
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); |