List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:September 15 2010 3:07pm
Subject:bzr commit into mysql-5.1-innodb branch (vasil.dimov:3594) Bug#55227
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-5.1-innodb/ based on revid:vasil.dimov@stripped

 3594 Vasil Dimov	2010-09-15
      (partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6
      
      Fix compiler warning:
      handler/ha_innodb.cc: In function 'bool innodb_show_status(handlerton*, THD*, bool (*)(THD*, const char*, uint, const char*, uint, const char*, uint))':
      handler/ha_innodb.cc:8851:7: error: variable 'result' set but not used [-Werror=unused-but-set-variable]

    modified:
      storage/innodb_plugin/handler/ha_innodb.cc
=== modified file 'storage/innodb_plugin/handler/ha_innodb.cc'
--- a/storage/innodb_plugin/handler/ha_innodb.cc	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -8848,12 +8848,9 @@ innodb_show_status(
 
 	mutex_exit(&srv_monitor_file_mutex);
 
-	bool result = FALSE;
+	stat_print(thd, innobase_hton_name, (uint) strlen(innobase_hton_name),
+		   STRING_WITH_LEN(""), str, flen);
 
-	if (stat_print(thd, innobase_hton_name, (uint) strlen(innobase_hton_name),
-			STRING_WITH_LEN(""), str, flen)) {
-		result= TRUE;
-	}
 	my_free(str, MYF(0));
 
 	DBUG_RETURN(FALSE);


Attachment: [text/bzr-bundle] bzr/vasil.dimov@oracle.com-20100915150646-2lmiualk7pzyx9ea.bundle
Thread
bzr commit into mysql-5.1-innodb branch (vasil.dimov:3594) Bug#55227vasil.dimov16 Sep