bzr commit into mysql-5.1-innodb branch (vasil.dimov:3479)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-5.1-innodb/ based on revid:vasil.dimov@stripped

 3479 Vasil Dimov	2010-05-25
      Fix comments on row_merge_write()
      
      This is a port of
      vasil.dimov@stripped and
      vasil.dimov@stripped
      from mysql-trunk-innodb

    modified:
      storage/innodb_plugin/row/row0merge.c
=== modified file 'storage/innodb_plugin/row/row0merge.c'
--- a/storage/innodb_plugin/row/row0merge.c	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/row/row0merge.c	revid:vasil.dimov@stripped
@@ -717,14 +717,16 @@ row_merge_read(
 }
 
 /********************************************************************//**
-Read a merge block from the file system.
+Write a merge block to the file system.
 @return	TRUE if request was successful, FALSE if fail */
 static
 ibool
 row_merge_write(
 /*============*/
 	int		fd,	/*!< in: file descriptor */
-	ulint		offset,	/*!< in: offset where to write */
+	ulint		offset,	/*!< in: offset where to read
+				in number of row_merge_block_t
+				elements */
 	const void*	buf)	/*!< in: data */
 {
 	ib_uint64_t	ofs = ((ib_uint64_t) offset)


Attachment: [text/bzr-bundle] bzr/[e-mail]