bzr commit into mysql-next-mr-innodb branch (marko.makela:3273)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/mysql-next-mr-innodb/ based on revid:marko.makela@stripped70352-rs6mrlgx3lj1fn6r

 3273 Marko Mäkelä	2010-10-27
      Replace /*TODO/*...*/ comments to fix gcc -Wall -Werror.

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/row/row0sel.c
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:[e-mail]-20101027070352-rs6mrlgx3lj1fn6r
+++ b/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped01027070543-qr15z0d85tgfaugc
@@ -4980,7 +4980,7 @@ ha_innobase::build_template(
 				/* Index condition pushdown can be used on
 				all columns of a secondary index, and on
 				the PRIMARY KEY columns. */
-				/*TODO/*enable this assertion
+				/* TODO: enable this assertion
 				(but first ensure that end_range is
 				valid here and use an accurate condition
 				for end_range)

=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:marko.makela@stripped70352-rs6mrlgx3lj1fn6r
+++ b/storage/innobase/row/row0sel.c	revid:marko.makela@strippedtgfaugc
@@ -4643,7 +4643,7 @@ next_rec:
 	/*-------------------------------------------------------------*/
 	/* PHASE 5: Move the cursor to the next index record */
 
-	/*TODO/*with ICP, do this when switching pages, every N pages */
+	/* TODO: with ICP, do this when switching pages, every N pages */
 	if (UNIV_UNLIKELY(mtr_has_extra_clust_latch)) {
 		/* We must commit mtr if we are moving to the next
 		non-clustered index record, because we could break the

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