diff options
| author | unknown <brian@avenger.(none)> | 2004-11-30 13:42:19 -0800 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2004-11-30 13:42:19 -0800 |
| commit | 1e1654fe2178f55c1a50cdc44c7a414001db20b2 (patch) | |
| tree | 049e84f3b4333ee6c04df35ab987e538c1d8bfbd /innobase/include/row0mysql.h | |
| parent | f299ff85b5c46d3cc81c668ee750fe257f138633 (diff) | |
| parent | b5622875aa821aba89824fb101ce6b6c8ea80e35 (diff) | |
| download | mariadb-git-1e1654fe2178f55c1a50cdc44c7a414001db20b2.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into avenger.(none):/export/brian/mysql/merge/5.0
innobase/include/row0mysql.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'innobase/include/row0mysql.h')
| -rw-r--r-- | innobase/include/row0mysql.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index ce86efa2fc7..c23a0e025ad 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -177,10 +177,12 @@ row_lock_table_for_mysql( /* out: error code or DB_SUCCESS */ row_prebuilt_t* prebuilt, /* in: prebuilt struct in the MySQL table handle */ - dict_table_t* table); /* in: table to LOCK_IX, or NULL + dict_table_t* table, /* in: table to lock, or NULL if prebuilt->table should be locked as LOCK_TABLE_EXP | prebuilt->select_lock_type */ + ulint mode); /* in: lock mode of table */ + /************************************************************************* Does an insert for MySQL. */ |