diff options
| author | unknown <monty@mysql.com> | 2004-11-09 04:06:44 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-09 04:06:44 +0200 |
| commit | e0bf844c8ac4cd1efc9547637baac5201775a1c7 (patch) | |
| tree | a936b651bfe5aa74bd01c17224531d16117c29d9 /innobase/include/row0mysql.h | |
| parent | 20c82f5c014e9902f234f925a218895f3b91b154 (diff) | |
| parent | db67626196992923be83c12302d03cad35cf80f9 (diff) | |
| download | mariadb-git-e0bf844c8ac4cd1efc9547637baac5201775a1c7.tar.gz | |
merge on pull
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
configure.in:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'innobase/include/row0mysql.h')
| -rw-r--r-- | innobase/include/row0mysql.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index 581f1bcade3..d4634482752 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -175,8 +175,12 @@ int row_lock_table_for_mysql( /*=====================*/ /* out: error code or DB_SUCCESS */ - row_prebuilt_t* prebuilt); /* in: prebuilt struct in the MySQL + row_prebuilt_t* prebuilt, /* in: prebuilt struct in the MySQL table handle */ + dict_table_t* table); /* in: table to LOCK_IX, or NULL + if prebuilt->table should be + locked as LOCK_TABLE_EXP | + prebuilt->select_lock_type */ /************************************************************************* Does an insert for MySQL. */ |