diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-06 16:33:11 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-06 16:33:11 +0300 |
| commit | a7123f507598690ef0fce68b5d8dc58e63635024 (patch) | |
| tree | 87f81592dbe473770830e1fb168699544d5484c3 | |
| parent | 6ed4a283fd18a3dbbd7042edb61e12fbd1e3f366 (diff) | |
| download | mariadb-git-a7123f507598690ef0fce68b5d8dc58e63635024.tar.gz | |
Fixed compiler warnings
sql/log.h:
Fixed compiler warnings reported for gcc 2.7.1
storage/xtradb/handler/ha_innodb.cc:
Remove not used variables
| -rw-r--r-- | sql/log.h | 4 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/log.h b/sql/log.h index b350f3882fa..6c21a34fd08 100644 --- a/sql/log.h +++ b/sql/log.h @@ -477,8 +477,8 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG void mark_xids_active(uint xid_count); public: - MYSQL_LOG::generate_name; - MYSQL_LOG::is_open; + using MYSQL_LOG::generate_name; + using MYSQL_LOG::is_open; /* This is relay log */ bool is_relay_log; diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 35a0047a15e..90f7b990d23 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -12562,7 +12562,7 @@ static MYSQL_SYSVAR_BOOL(use_sys_stats_table, innobase_use_sys_stats_table, "So you should use ANALYZE TABLE command intentionally.", NULL, NULL, FALSE); -#ifdef UNIV_DEBUG +#ifdef UNIV_DEBUG_never static MYSQL_SYSVAR_ULONG(sys_stats_root_page, innobase_sys_stats_root_page, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Override the SYS_STATS root page id, 0 = no override (for testing only)", @@ -12785,7 +12785,7 @@ static MYSQL_SYSVAR_ULONG(read_ahead_threshold, srv_read_ahead_threshold, "trigger a readahead.", NULL, NULL, 56, 0, 64, 0); -#ifdef UNIV_DEBUG +#ifdef UNIV_DEBUG_never static MYSQL_SYSVAR_UINT(trx_rseg_n_slots_debug, trx_rseg_n_slots_debug, PLUGIN_VAR_RQCMDARG, "Debug flags for InnoDB to limit TRX_RSEG_N_SLOTS for trx_rsegf_undo_find_free()", |