diff options
| author | Michael Widenius <monty@mariadb.org> | 2019-01-15 17:05:42 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2019-01-15 17:05:42 +0200 |
| commit | 9990027f872764d64e6a450fe9988fb9a7263c5c (patch) | |
| tree | b0f9473e63aa0edd0de7019f934cd9f34408f80d /storage | |
| parent | ce06990056824f0a3ef15cdf9980aaa3cfb911e0 (diff) | |
| download | mariadb-git-9990027f872764d64e6a450fe9988fb9a7263c5c.tar.gz | |
Fixed compiler warnings from optimized builds
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/plugutil.cpp | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 6 | ||||
| -rw-r--r-- | storage/maria/test_ma_backup.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/plugutil.cpp b/storage/connect/plugutil.cpp index 048f00be75f..6790e7eb45c 100644 --- a/storage/connect/plugutil.cpp +++ b/storage/connect/plugutil.cpp @@ -526,7 +526,7 @@ BOOL PlugSubSet(void *memp, uint size) /***********************************************************************/ /* Use it to export a function that do throwing. */ /***********************************************************************/ -void *DoThrow(int n) +static void *DoThrow(int n) { throw n; } /* end of DoThrow */ diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 2295e3fa5bf..e00380374eb 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -167,7 +167,7 @@ to instant->dropped[] template<bool replace_dropped> inline void dict_table_t::init_instant(const dict_table_t& table) { - const dict_index_t& oindex = *table.indexes.start; + const dict_index_t& oindex __attribute__((unused))= *table.indexes.start; dict_index_t& index = *indexes.start; const unsigned u = index.first_user_field(); DBUG_ASSERT(u == oindex.first_user_field()); @@ -785,9 +785,9 @@ inline void dict_table_t::rollback_instant( index->get_n_nullable(index->n_core_fields)); const dict_col_t* const new_cols = cols; - const dict_col_t* const new_cols_end = cols + n_cols; + const dict_col_t* const new_cols_end __attribute__((unused)) = cols + n_cols; const dict_v_col_t* const new_v_cols = v_cols; - const dict_v_col_t* const new_v_cols_end = v_cols + n_v_cols; + const dict_v_col_t* const new_v_cols_end __attribute__((unused))= v_cols + n_v_cols; cols = old_cols; col_names = old_col_names; diff --git a/storage/maria/test_ma_backup.c b/storage/maria/test_ma_backup.c index 439ea7fd665..2a9a6704ecb 100644 --- a/storage/maria/test_ma_backup.c +++ b/storage/maria/test_ma_backup.c @@ -32,7 +32,7 @@ static int create_test_table(const char *table_name, int stage); static int copy_table(const char *table_name, int stage); static void create_record(uchar *record,uint rownr); -int main(int argc,char *argv[]) +int main(int argc __attribute__((unused)), char *argv[]) { int error= 1; int i; |