diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-03 11:25:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-03 11:25:14 +0200 |
| commit | a5352c8970674b21aa88771e7997edc159fb9663 (patch) | |
| tree | 8ae83a724bade9c3956e542cf6bf71ee49ca07d4 /storage/innobase/row/row0upd.c | |
| parent | 6bcad3dc356182cb8314dbcf7efefcb863044520 (diff) | |
| parent | bfc704035514564e39e0c01ba6f1dbf40086c3c1 (diff) | |
| download | mariadb-git-a5352c8970674b21aa88771e7997edc159fb9663.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'storage/innobase/row/row0upd.c')
| -rw-r--r-- | storage/innobase/row/row0upd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/row/row0upd.c b/storage/innobase/row/row0upd.c index a564a2367c5..81750938f58 100644 --- a/storage/innobase/row/row0upd.c +++ b/storage/innobase/row/row0upd.c @@ -371,8 +371,8 @@ UNIV_INTERN void row_upd_index_entry_sys_field( /*==========================*/ - const dtuple_t* entry, /*!< in: index entry, where the memory buffers - for sys fields are already allocated: + dtuple_t* entry, /*!< in/out: index entry, where the memory + buffers for sys fields are already allocated: the function just copies the new values to them */ dict_index_t* index, /*!< in: clustered index */ @@ -1615,12 +1615,12 @@ static ulint row_upd_clust_rec_by_insert( /*========================*/ - upd_node_t* node, /*!< in: row update node */ + upd_node_t* node, /*!< in/out: row update node */ dict_index_t* index, /*!< in: clustered index of the record */ que_thr_t* thr, /*!< in: query thread */ ibool referenced,/*!< in: TRUE if index may be referenced in a foreign key constraint */ - mtr_t* mtr) /*!< in: mtr; gets committed here */ + mtr_t* mtr) /*!< in/out: mtr; gets committed here */ { mem_heap_t* heap = NULL; btr_pcur_t* pcur; |