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

[vasil.dimov]

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

 3596 Vasil Dimov	2010-09-15
      (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6
      
      Fix compiler warning:
      handler/i_s.cc: In function 'int trx_i_s_common_fill_table(THD*, TABLE_LIST*, COND*)':
      handler/i_s.cc:931:8: error: variable 'ret' set but not used [-Werror=unused-but-set-variable]

    modified:
      storage/innodb_plugin/handler/i_s.cc
=== modified file 'storage/innodb_plugin/handler/i_s.cc'
--- a/storage/innodb_plugin/handler/i_s.cc	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/handler/i_s.cc	revid:vasil.dimov@stripped
@@ -1013,6 +1013,7 @@ trx_i_s_common_fill_table(
 	see http://bugs.mysql.com/29900 ; when that bug is resolved
 	we can enable the DBUG_RETURN(ret) above */
 	DBUG_RETURN(0);
+	ret++;  // silence a gcc46 warning
 #endif
 }
 


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