diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-09-15 18:06:46 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-09-15 18:06:46 +0300 |
| commit | 7ed6878c6d3a00f421d3b7951f05880ff3f39d0b (patch) | |
| tree | 605d5cc6d2c6c0f855efd3b27d6739345fdbefb9 /storage | |
| parent | ab5570d561621b809a1780cf91b4e7a3a68f9014 (diff) | |
| download | mariadb-git-7ed6878c6d3a00f421d3b7951f05880ff3f39d0b.tar.gz | |
(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]
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/handler/ha_innodb.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc index c7474109d4f..485c706d7c1 100644 --- a/storage/innodb_plugin/handler/ha_innodb.cc +++ b/storage/innodb_plugin/handler/ha_innodb.cc @@ -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); |