bzr commit into mysql-5.1-innodb branch (vasil.dimov:3603) Bug#55227

[vasil.dimov]

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

 3603 Vasil Dimov	2010-09-15
      (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6
      
      Fix compiler warning:
      row/row0vers.c: In function 'row_vers_impl_x_locked_off_kernel':
      row/row0vers.c:74:9: error: variable 'err' set but not used [-Werror=unused-but-set-variable]

    modified:
      storage/innodb_plugin/row/row0vers.c
=== modified file 'storage/innodb_plugin/row/row0vers.c'
--- a/storage/innodb_plugin/row/row0vers.c	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/row/row0vers.c	revid:vasil.dimov@stripped
@@ -71,7 +71,9 @@ row_vers_impl_x_locked_off_kernel(
 					warning */
 	trx_t*		trx;
 	ulint		rec_del;
+#ifdef UNIV_DEBUG
 	ulint		err;
+#endif /* UNIV_DEBUG */
 	mtr_t		mtr;
 	ulint		comp;
 
@@ -169,9 +171,12 @@ row_vers_impl_x_locked_off_kernel(
 
 		heap2 = heap;
 		heap = mem_heap_create(1024);
-		err = trx_undo_prev_version_build(clust_rec, &mtr, version,
-						  clust_index, clust_offsets,
-						  heap, &prev_version);
+#ifdef UNIV_DEBUG
+		err =
+#endif /* UNIV_DEBUG */
+		trx_undo_prev_version_build(clust_rec, &mtr, version,
+					    clust_index, clust_offsets,
+					    heap, &prev_version);
 		mem_heap_free(heap2); /* free version and clust_offsets */
 
 		if (prev_version == NULL) {


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