Fix gcc 4.6 warning after merge with 5.1

5 files changed, 13 insertions, 7 deletions

diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 70572b406e5..c6f413e754e 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -2081,8 +2081,8 @@ int multi_update::do_updates()
 err:
   {
     thd->fatal_error();
-    prepare_record_for_error_message(local_error, table);
-    table->file->print_error(local_error,MYF(0));
+    prepare_record_for_error_message(local_error, err_table);
+    err_table->file->print_error(local_error,MYF(0));
   }
 
 err2:
diff --git a/sql/table.cc b/sql/table.cc
index 21575e419da..bf7265e974f 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -5484,7 +5484,7 @@ int update_virtual_fields(THD *thd, TABLE *table, bool for_write)
 {
   DBUG_ENTER("update_virtual_fields");
   Field **vfield_ptr, *vfield;
-  int error= 0;
+  int error __attribute__ ((unused))= 0;
   if (!table || !table->vfield)
     DBUG_RETURN(0);
 
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c
index 6165e211566..74898d981e9 100644
--- a/storage/maria/ma_blockrec.c
+++ b/storage/maria/ma_blockrec.c
@@ -5342,7 +5342,6 @@ int _ma_scan_block_record(MARIA_HA *info, uchar *record,
                           my_bool skip_deleted __attribute__ ((unused)))
 {
   uint block_size;
-  my_off_t filepos;
   MARIA_SHARE *share= info->s;
   DBUG_ENTER("_ma_scan_block_record");
 
@@ -5472,7 +5471,6 @@ restart_bitmap_scan:
 
   /* Read next bitmap */
   info->scan.bitmap_page+= share->bitmap.pages_covered;
-  filepos= (my_off_t) info->scan.bitmap_page * block_size;
   if (unlikely(info->scan.bitmap_page >= info->scan.max_page))
   {
     DBUG_PRINT("info", ("Found end of file"));
diff --git a/storage/maria/ma_dynrec.c b/storage/maria/ma_dynrec.c
index a88ef3bc3ba..200c6415086 100644
--- a/storage/maria/ma_dynrec.c
+++ b/storage/maria/ma_dynrec.c
@@ -1741,14 +1741,20 @@ int _ma_read_rnd_dynamic_record(MARIA_HA *info,
                                 MARIA_RECORD_POS filepos,
 				my_bool skip_deleted_blocks)
 {
-  int block_of_record, info_read;
+  int block_of_record;
+#ifdef MARIA_EXTERNAL_LOCKING
+  int info_read;
+#endif
+
   uint left_len,b_type;
   uchar *to;
   MARIA_BLOCK_INFO block_info;
   MARIA_SHARE *share= info->s;
   DBUG_ENTER("_ma_read_rnd_dynamic_record");
 
+#ifdef MARIA_EXTERNAL_LOCKING
   info_read=0;
+#endif
   LINT_INIT(to);
 
   if (info->lock_type == F_UNLCK)
@@ -1758,8 +1764,10 @@ int _ma_read_rnd_dynamic_record(MARIA_HA *info,
     info->tmp_lock_type=F_RDLCK;
 #endif
   }
+#ifdef MARIA_EXTERNAL_LOCKING
   else
     info_read=1;				/* memory-keyinfoblock is ok */
+#endif
 
   block_of_record= 0;   /* First block of record is numbered as zero. */
   block_info.second_read= 0;
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
index 6f4f12a318c..0d9f3a381c0 100644
--- a/storage/sphinx/ha_sphinx.cc
+++ b/storage/sphinx/ha_sphinx.cc
@@ -703,7 +703,7 @@ static int sphinx_done_func ( void * )
 		pthread_mutex_destroy ( &sphinx_mutex );
 	}
 
-	SPH_RET(0);
+	SPH_RET(error);
 }