Bug#20458574 FIX ALL THE ARRAY BOUNDS WARNINGS

Tor Didriksen · Tor Didriksen · commit bccdbcba25ec · 2015-02-17T15:57:02.000+01:00
Remove compiler warnings when building in optimized mode: In strings/decimal.c fix numerous warnings of the type: array subscript is below array bounds [-Werror=array-bounds] This part of the patch is based on a patch from https://github.com/webscalesql/webscalesql-5.6 That patch added some bounds-checks for loops, and worked for gcc4.8.3 but not for gcc 4.9.1 so it was re-written to unroll the loops instead. In other source files, fix numerous warnings of the type: variable XX set but not used [-Werror=unused-but-set-variable] variable XX may be used uninitialized in this function [-Werror=maybe-uninitialized] These were variables used only for debugging purposes, or variables not proven to be set by all execution paths. Compiled with gcc 4.7.2 4.8.3 4.9.1 in optimized mode, with -Wall -Werror
diff --git a/client/mysqldump.c b/client/mysqldump.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1907,7 +1907,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
                           const char *str_create)
 {
   uint i;
-  my_bool body_found= 0;
+  my_bool body_found __attribute__((unused)) = 0;
   char *create_stmt_ptr= NULL;
   ulong create_stmt_len= 0;
   MYSQL_FIELD *field;
diff --git a/sql/filesort.cc b/sql/filesort.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1020,7 +1020,7 @@ void make_sortkey(Sort_param *param, uchar *to, uchar *ref_pos)
         if (sort_field->need_strxnfrm)
         {
           char *from=(char*) res->ptr();
-          uint tmp_length;
+          uint tmp_length __attribute__((unused));
           if ((uchar*) from == to)
           {
             DBUG_ASSERT(sort_field->length >= length);
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -234,7 +234,7 @@ static bool check_partition_column_order(List<Create_field> *create_list,
 
   Field **f_ptr;
   List_iterator_fast<Create_field> new_field_it;
-  Create_field *new_field;
+  Create_field *new_field= NULL;
   new_field_it.init(*create_list);
 
   for (f_ptr= field_arary ; *f_ptr; f_ptr++)
diff --git a/sql/handler.cc b/sql/handler.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -6271,7 +6271,7 @@ int DsMrr_impl::dsmrr_next(char **range_info)
 ha_rows DsMrr_impl::dsmrr_info(uint keyno, uint n_ranges, uint rows,
                                uint *bufsz, uint *flags, Cost_estimate *cost)
 {  
-  ha_rows res;
+  ha_rows res __attribute__((unused));
   uint def_flags= *flags;
   uint def_bufsz= *bufsz;
 
diff --git a/sql/hostname.cc b/sql/hostname.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -413,7 +413,7 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage,
 {
   const struct sockaddr *ip= (const sockaddr *) ip_storage;
   int err_code;
-  bool err_status;
+  bool err_status __attribute__((unused));
   Host_errors errors;
 
   DBUG_ENTER("ip_to_hostname");
diff --git a/sql/log_event.cc b/sql/log_event.cc
@@ -2733,7 +2733,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
   {
     if (!rli->curr_group_seen_gtid && !rli->curr_group_seen_begin)
     {
-      ulong gaq_idx;
+      ulong gaq_idx __attribute__((unused));
       rli->mts_groups_assigned++;
 
       rli->curr_group_isolated= FALSE;
diff --git a/sql/mdl.cc b/sql/mdl.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1930,7 +1930,7 @@ MDL_context::find_ticket(MDL_request *mdl_request,
 bool
 MDL_context::try_acquire_lock(MDL_request *mdl_request)
 {
-  MDL_ticket *ticket;
+  MDL_ticket *ticket= NULL;
 
   if (try_acquire_lock_impl(mdl_request, &ticket))
     return TRUE;
@@ -2184,7 +2184,7 @@ bool
 MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout)
 {
   MDL_lock *lock;
-  MDL_ticket *ticket;
+  MDL_ticket *ticket= NULL;
   struct timespec abs_timeout;
   MDL_wait::enum_wait_status wait_status;
   /* Do some work outside the critical section. */
diff --git a/sql/rpl_master.cc b/sql/rpl_master.cc
@@ -862,7 +862,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
   String* packet = &thd->packet;
   time_t last_event_sent_ts= time(0);
   bool time_for_hb_event= false;
-  int error;
+  int error= 0;
   const char *errmsg = "Unknown error";
   char error_text[MAX_SLAVE_ERRMSG]; // to be send to slave via my_message()
   NET* net = &thd->net;
diff --git a/sql/rpl_rli_pdb.cc b/sql/rpl_rli_pdb.cc
@@ -1,3 +1,18 @@
+/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
 #include "my_global.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */
 #include "sql_priv.h"
 #include "unireg.h"
@@ -1369,7 +1384,7 @@ ulong Slave_committed_queue::move_queue_head(DYNAMIC_ARRAY *ws)
     Slave_worker *w_i;
     Slave_job_group *ptr_g, g;
     char grl_name[FN_REFLEN];
-    ulong ind;
+    ulong ind __attribute__((unused));
 
 #ifndef DBUG_OFF
     if (DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0) &&
diff --git a/sql/rpl_slave.cc b/sql/rpl_slave.cc
@@ -1233,7 +1233,7 @@ terminate_slave_thread(THD *thd,
 
   while (*slave_running)                        // Should always be true
   {
-    int error;
+    int error __attribute__((unused));
     DBUG_PRINT("loop", ("killing slave thread"));
 
     mysql_mutex_lock(&thd->LOCK_thd_data);
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -200,6 +200,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   LOAD_FILE_INFO lf_info;
   THD::killed_state killed_status= THD::NOT_KILLED;
   bool is_concurrent;
+  bool transactional_table;
 #endif
   char *db = table_list->db;			// This is never null
   /*
@@ -209,7 +210,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   */
   char *tdb= thd->db ? thd->db : db;		// Result is never null
   ulong skip_lines= ex->skip_lines;
-  bool transactional_table;
   DBUG_ENTER("mysql_load");
 
   /*
@@ -277,8 +277,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   }
 
   table= table_list->table;
-  transactional_table= table->file->has_transactions();
 #ifndef EMBEDDED_LIBRARY
+  transactional_table= table->file->has_transactions();
   is_concurrent= (table_list->lock_type == TL_WRITE_CONCURRENT_INSERT);
 #endif
 
@@ -664,9 +664,14 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   /* ok to client sent only after binlog write and engine commit */
   my_ok(thd, info.stats.copied + info.stats.deleted, 0L, name);
 err:
+#ifndef EMBEDDED_LIBRARY
   DBUG_ASSERT(transactional_table ||
               !(info.stats.copied || info.stats.deleted) ||
               thd->transaction.stmt.cannot_safely_rollback());
+#else
+  DBUG_ASSERT(!(info.stats.copied || info.stats.deleted) ||
+              thd->transaction.stmt.cannot_safely_rollback());
+#endif
   table->file->ha_release_auto_increment();
   table->auto_increment_field_not_null= FALSE;
   thd->abort_on_warning= 0;
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
@@ -6266,7 +6266,7 @@ fts_fake_hex_to_dec(
 {
 	ib_id_t		dec_id = 0;
 	char		tmp_id[FTS_AUX_MIN_TABLE_ID_LENGTH];
-	int		ret;
+	int		ret __attribute__((unused));
 
 	ret = sprintf(tmp_id, UINT64PFx, id);
 	ut_ad(ret == 16);
diff --git a/storage/myisam/ft_update.c b/storage/myisam/ft_update.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ uint _mi_ft_segiterator(register FT_SEG_ITERATOR *ftsi)
 uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const uchar *record,
                   MYSQL_FTPARSER_PARAM *param, MEM_ROOT *mem_root)
 {
-  FT_SEG_ITERATOR ftsi;
+  FT_SEG_ITERATOR ftsi= { 0, 0, NULL, NULL, NULL };
   struct st_mysql_ftparser *parser;
   DBUG_ENTER("_mi_ft_parse");
 
@@ -169,7 +169,8 @@ static int _mi_ft_erase(MI_INFO *info, uint keynr, uchar *keybuf,
 
 int _mi_ft_cmp(MI_INFO *info, uint keynr, const uchar *rec1, const uchar *rec2)
 {
-  FT_SEG_ITERATOR ftsi1, ftsi2;
+  FT_SEG_ITERATOR ftsi1= { 0, 0, NULL, NULL, NULL };
+  FT_SEG_ITERATOR ftsi2= { 0, 0, NULL, NULL, NULL };
   const CHARSET_INFO *cs= info->s->keyinfo[keynr].seg->charset;
   DBUG_ENTER("_mi_ft_cmp");
   _mi_ft_segiterator_init(info, keynr, rec1, &ftsi1);
diff --git a/storage/perfschema/pfs_account.cc b/storage/perfschema/pfs_account.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -527,9 +527,7 @@ void purge_account(PFS_thread *thread, PFS_account *account,
                     account->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    PFS_account *pfs;
-    pfs= *entry;
-    DBUG_ASSERT(pfs == account);
+    DBUG_ASSERT(*entry == account);
     if (account->get_refcount() == 0)
     {
       lf_hash_delete(&account_hash, pins,
diff --git a/storage/perfschema/pfs_host.cc b/storage/perfschema/pfs_host.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -353,9 +353,7 @@ void purge_host(PFS_thread *thread, PFS_host *host)
                     host->m_key.m_hash_key, host->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    PFS_host *pfs;
-    pfs= *entry;
-    DBUG_ASSERT(pfs == host);
+    DBUG_ASSERT(*entry == host);
     if (host->get_refcount() == 0)
     {
       lf_hash_delete(&host_hash, pins,
diff --git a/storage/perfschema/pfs_user.cc b/storage/perfschema/pfs_user.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -346,9 +346,7 @@ void purge_user(PFS_thread *thread, PFS_user *user)
                     user->m_key.m_hash_key, user->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    PFS_user *pfs;
-    pfs= *entry;
-    DBUG_ASSERT(pfs == user);
+    DBUG_ASSERT(*entry == user);
     if (user->get_refcount() == 0)
     {
       lf_hash_delete(&user_hash, pins,
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -2545,14 +2545,17 @@ void my_fill_utf32(const CHARSET_INFO *cs,
                    char *s, size_t slen, int fill)
 {
   char buf[10];
-  uint buflen;
   char *e= s + slen;
   
   DBUG_ASSERT((slen % 4) == 0);
-
-  buflen= cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf,
-                          (uchar*) buf + sizeof(buf));
-  DBUG_ASSERT(buflen == 4);
+  {
+#ifndef DBUG_OFF
+    uint buflen=
+#endif
+      cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf,
+                      (uchar*) buf + sizeof(buf));
+    DBUG_ASSERT(buflen == 4);
+  }
   while (s < e)
   {
     memcpy(s, buf, 4);
diff --git a/strings/decimal.c b/strings/decimal.c
diff --git a/vio/viosocket.c b/vio/viosocket.c

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`
`3`	`3`	`This program is free software; you can redistribute it and/or modify`
`4`	`4`	`it under the terms of the GNU General Public License as published by`
`@@ -1020,7 +1020,7 @@ void make_sortkey(Sort_param param, uchar to, uchar *ref_pos)`
`1020`	`1020`	`if (sort_field->need_strxnfrm)`
`1021`	`1021`	`{`
`1022`	`1022`	`char from=(char) res->ptr();`
`1023`		`- uint tmp_length;`
	`1023`	`+ uint tmp_length __attribute__((unused));`
`1024`	`1024`	`if ((uchar*) from == to)`
`1025`	`1025`	`{`
`1026`	`1026`	`DBUG_ASSERT(sort_field->length >= length);`
Original file line number	Diff line number	Diff line change
`@@ -2733,7 +2733,7 @@ Slave_worker Log_event::get_slave_worker(Relay_log_info rli)`
`2733`	`2733`	`{`
`2734`	`2734`	`if (!rli->curr_group_seen_gtid && !rli->curr_group_seen_begin)`
`2735`	`2735`	`{`
`2736`		`- ulong gaq_idx;`
	`2736`	`+ ulong gaq_idx __attribute__((unused));`
`2737`	`2737`	`rli->mts_groups_assigned++;`
`2738`	`2738`
`2739`	`2739`	`rli->curr_group_isolated= FALSE;`
Original file line number	Diff line number	Diff line change
`@@ -1233,7 +1233,7 @@ terminate_slave_thread(THD *thd,`
`1233`	`1233`
`1234`	`1234`	`while (*slave_running) // Should always be true`
`1235`	`1235`	`{`
`1236`		`- int error;`
	`1236`	`+ int error __attribute__((unused));`
`1237`	`1237`	`DBUG_PRINT("loop", ("killing slave thread"));`
`1238`	`1238`
`1239`	`1239`	`mysql_mutex_lock(&thd->LOCK_thd_data);`