Removed files that had been accidentally committed

Removed compiler warnings

mysys/my_aes.c.THIS

-/* Copyright (c) 2002, 2006 MySQL AB
-   Use is subject to license terms
-
- 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 Street, Fifth Floor, Boston, MA  02110-1301, USA */
-
-
-/*
-  Implementation of AES Encryption for MySQL
-  Initial version by Peter Zaitsev  June 2002
-*/
-
-
-#include <my_global.h>
-#include <m_string.h>
-#include "my_aes.h"
-
-enum encrypt_dir { AES_ENCRYPT, AES_DECRYPT };
-
-#define AES_BLOCK_SIZE 16	/* Block size in bytes */
-
-#define AES_BAD_DATA  -1	/* If bad data discovered during decoding */
-
-
-/* The structure for key information */
-typedef struct {
-  int	nr;				/* Number of rounds */
-  uint32   rk[4*(AES_MAXNR + 1)];	/* key schedule */
-} KEYINSTANCE;
-
-
-/*
-  This is internal function just keeps joint code of Key generation
-
-  SYNOPSIS
-    my_aes_create_key()
-    aes_key		Address of Key Instance to be created
-    direction		Direction (are we encoding or decoding)
-    key			Key to use for real key creation
-    key_length		Length of the key
-
-  DESCRIPTION
-
-  RESULT
-    0	ok
-    -1	Error		Note: The current impementation never returns this
-*/
-
-static int my_aes_create_key(KEYINSTANCE *aes_key,
-			     enum encrypt_dir direction, const char *key,
-			     int key_length)
-{
-  uint8 rkey[AES_KEY_LENGTH/8];	 /* The real key to be used for encryption */
-  uint8 *rkey_end=rkey+AES_KEY_LENGTH/8; /* Real key boundary */
-  uint8 *ptr;			/* Start of the real key*/
-  const char *sptr;			/* Start of the working key */
-  const char *key_end=key+key_length;	/* Working key boundary*/
-
-  bzero((char*) rkey,AES_KEY_LENGTH/8);      /* Set initial key  */
-
-  for (ptr= rkey, sptr= key; sptr < key_end; ptr++,sptr++)
-  {
-    if (ptr == rkey_end)
-      ptr= rkey;  /*  Just loop over tmp_key until we used all key */
-    *ptr^= (uint8) *sptr;
-  }
-#ifdef AES_USE_KEY_BITS
-  /*
-   This block is intended to allow more weak encryption if application 
-   build with libmysqld needs to correspond to export regulations
-   It should be never used in normal distribution as does not give 
-   any speed improvement.
-   To get worse security define AES_USE_KEY_BITS to number of bits
-   you want key to be. It should be divisible by 8
-   
-   WARNING: Changing this value results in changing of enryption for 
-   all key lengths  so altering this value will result in impossibility
-   to decrypt data encrypted with previous value       
-  */
-#define AES_USE_KEY_BYTES (AES_USE_KEY_BITS/8)
-  /*
-   To get weaker key we use first AES_USE_KEY_BYTES bytes of created key 
-   and cyclically copy them until we created all required key length
-  */  
-  for (ptr= rkey+AES_USE_KEY_BYTES, sptr=rkey ; ptr < rkey_end; 
-       ptr++,sptr++)
-  {
-    if (sptr == rkey+AES_USE_KEY_BYTES)
-      sptr=rkey;
-    *ptr=*sptr;   
-  }      
-#endif
-  if (direction == AES_DECRYPT)
-     aes_key->nr = rijndaelKeySetupDec(aes_key->rk, rkey, AES_KEY_LENGTH);
-  else
-     aes_key->nr = rijndaelKeySetupEnc(aes_key->rk, rkey, AES_KEY_LENGTH);
-  return 0;
-}
-
-
-/*
-  Crypt buffer with AES encryption algorithm.
-
-  SYNOPSIS
-     my_aes_encrypt()
-     source		Pointer to data for encryption
-     source_length	Size of encryption data
-     dest		Buffer to place encrypted data (must be large enough)
-     key		Key to be used for encryption
-     key_length		Length of the key. Will handle keys of any length
-
-  RETURN
-    >= 0	Size of encrypted data
-    < 0		Error
-*/
-
-int my_aes_encrypt(const char* source, int source_length, char* dest,
-		   const char* key, int key_length)
-{
-  KEYINSTANCE aes_key;
-  uint8 block[AES_BLOCK_SIZE];	/* 128 bit block used for padding */
-  int rc;			/* result codes */
-  int num_blocks;		/* number of complete blocks */
-  char pad_len;			/* pad size for the last block */
-  int i;
-
-  if ((rc= my_aes_create_key(&aes_key,AES_ENCRYPT,key,key_length)))
-    return rc;
-
-  num_blocks = source_length/AES_BLOCK_SIZE;
-
-  for (i = num_blocks; i > 0; i--)   /* Encode complete blocks */
-  {
-    rijndaelEncrypt(aes_key.rk, aes_key.nr, (const uint8*) source,
-		    (uint8*) dest);
-    source+= AES_BLOCK_SIZE;
-    dest+= AES_BLOCK_SIZE;
-  }
-
-  /* Encode the rest. We always have incomplete block */
-  pad_len = AES_BLOCK_SIZE - (source_length - AES_BLOCK_SIZE*num_blocks);
-  memcpy(block, source, 16 - pad_len);
-  bfill(block + AES_BLOCK_SIZE - pad_len, pad_len, pad_len);
-  rijndaelEncrypt(aes_key.rk, aes_key.nr, block, (uint8*) dest);
-  return AES_BLOCK_SIZE*(num_blocks + 1);
-}
-
-
-/*
-  DeCrypt buffer with AES encryption algorithm.
-
-  SYNOPSIS
-    my_aes_decrypt()
-    source		Pointer to data for decryption
-    source_length	Size of encrypted data
-    dest		Buffer to place decrypted data (must be large enough)
-    key			Key to be used for decryption
-    key_length		Length of the key. Will handle keys of any length
-
-  RETURN
-    >= 0	Size of encrypted data
-    < 0		Error
-*/
-
-int my_aes_decrypt(const char *source, int source_length, char *dest,
-		   const char *key, int key_length)
-{
-  KEYINSTANCE aes_key;
-  uint8 block[AES_BLOCK_SIZE];	/* 128 bit block used for padding */
-  int rc;			/* Result codes */
-  int num_blocks;		/* Number of complete blocks */
-  uint pad_len;			/* Pad size for the last block */
-  int i;
-
-  if ((rc=my_aes_create_key(&aes_key,AES_DECRYPT,key,key_length)))
-    return rc;
-
-  num_blocks = source_length/AES_BLOCK_SIZE;
-
-  if ((source_length != num_blocks*AES_BLOCK_SIZE) || num_blocks ==0 )
-    return AES_BAD_DATA; /* Input size has to be even and at least one block */
-
-  for (i = num_blocks-1; i > 0; i--)   /* Decode all but last blocks */
-  {
-    rijndaelDecrypt(aes_key.rk, aes_key.nr, (const uint8*) source,
-		    (uint8*) dest);
-    source+= AES_BLOCK_SIZE;
-    dest+= AES_BLOCK_SIZE;
-  }
-
-  rijndaelDecrypt(aes_key.rk, aes_key.nr, (const uint8*) source, block);
-  /* Use last char in the block as size */
-  pad_len = (uint) (uchar) block[AES_BLOCK_SIZE-1];
-
-  if (pad_len > AES_BLOCK_SIZE)
-    return AES_BAD_DATA;
-  /* We could also check whole padding but we do not really need this */
-
-  memcpy(dest, block, AES_BLOCK_SIZE - pad_len);
-  return AES_BLOCK_SIZE*num_blocks - pad_len;
-}
-
-
-/*
-  Get size of buffer which will be large enough for encrypted data
-
-  SYNOPSIS
-    my_aes_get_size()
-    source_length		Length of data to be encrypted
-
- RETURN
-   Size of buffer required to store encrypted data
-*/
-
-int my_aes_get_size(int source_length)
-{
-  return AES_BLOCK_SIZE*(source_length/AES_BLOCK_SIZE)+AES_BLOCK_SIZE;
-}

sql/events.cc

@@ -1131,8 +1131,11 @@ Events::load_events_from_db(THD *thd)
       goto end;
     }
 #ifdef WITH_WSREP
-    // when SST from master node who initials event, the event status is ENABLED
-    // this is problematic because there are two nodes with same events and both enabled.
+    /*
+      When SST from master node who initials event, the event status is ENABLED
+      this is problematic because there are two nodes with same events and
+      both enabled.
+    */
     if (WSREP(thd) && et->originator != thd->variables.server_id)
     {
         store_record(table, record[1]);

sql/log.cc

@@ -1910,12 +1910,12 @@ static bool trans_cannot_safely_rollback(THD *thd, bool all)
 
   return ((thd->variables.option_bits & OPTION_KEEP_LOG) ||
           (trans_has_updated_non_trans_table(thd) &&
-           WSREP_FORMAT(thd->variables.binlog_format) == BINLOG_FORMAT_STMT) ||
+           WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) == BINLOG_FORMAT_STMT) ||
           (cache_mngr->trx_cache.changes_to_non_trans_temp_table() &&
-           WSREP_FORMAT(thd->variables.binlog_format) == BINLOG_FORMAT_MIXED) ||
+           WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) == BINLOG_FORMAT_MIXED) ||
           (trans_has_updated_non_trans_table(thd) &&
            ending_single_stmt_trans(thd,all) &&
-           WSREP_FORMAT(thd->variables.binlog_format) == BINLOG_FORMAT_MIXED));
+           WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) == BINLOG_FORMAT_MIXED));
 }
 
 
@@ -2064,9 +2064,9 @@ static int binlog_rollback(handlerton *hton, THD *thd, bool all)
     else if (ending_trans(thd, all) ||
              (!(thd->variables.option_bits & OPTION_KEEP_LOG) &&
               (!stmt_has_updated_non_trans_table(thd) ||
-               WSREP_FORMAT(thd->variables.binlog_format) != BINLOG_FORMAT_STMT) &&
+               WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) != BINLOG_FORMAT_STMT) &&
               (!cache_mngr->trx_cache.changes_to_non_trans_temp_table() ||
-               WSREP_FORMAT(thd->variables.binlog_format) != BINLOG_FORMAT_MIXED)))
+               WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) != BINLOG_FORMAT_MIXED)))
       error= binlog_truncate_trx_cache(thd, cache_mngr, all);
   }
 

sql/sql_base.cc

@@ -3558,7 +3558,7 @@ thr_lock_type read_lock_type_for_table(THD *thd,
   */
   bool log_on= mysql_bin_log.is_open() && thd->variables.sql_log_bin;
   ulong binlog_format= thd->variables.binlog_format;
-  if ((log_on == FALSE) || (WSREP_FORMAT(binlog_format) == BINLOG_FORMAT_ROW) ||
+  if ((log_on == FALSE) || (WSREP_FORMAT((enum enum_binlog_format) binlog_format) == BINLOG_FORMAT_ROW) ||
       (table_list->table->s->table_category == TABLE_CATEGORY_LOG) ||
       (table_list->table->s->table_category == TABLE_CATEGORY_PERFORMANCE) ||
       !(is_update_query(prelocking_ctx->sql_command) ||
@@ -5327,7 +5327,7 @@ bool lock_tables(THD *thd, TABLE_LIST *tables, uint count,
         We can solve these problems in mixed mode by switching to binlogging 
         if at least one updated table is used by sub-statement
       */
-      if (WSREP_FORMAT(thd->variables.binlog_format) != BINLOG_FORMAT_ROW && tables && 
+      if (WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) != BINLOG_FORMAT_ROW && tables && 
           has_write_table_with_auto_increment(thd->lex->first_not_own_table()))
         thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_AUTOINC_COLUMNS);
     }

sql/sql_class.cc

@@ -879,8 +879,8 @@ extern "C" void thd_kill_timeout(THD* thd)
 
 
 THD::THD(bool is_wsrep_applier)
-   :Statement(&main_lex, &main_mem_root, STMT_CONVENTIONAL_EXECUTION,
-              /* statement id */ 0),
+  :Statement(&main_lex, &main_mem_root, STMT_CONVENTIONAL_EXECUTION,
+             /* statement id */ 0),
    rli_fake(0), rgi_fake(0), rgi_slave(NULL),
    in_sub_stmt(0), log_all_errors(0),
    binlog_unsafe_warning_flags(0),
@@ -913,16 +913,17 @@ THD::THD(bool is_wsrep_applier)
    debug_sync_control(0),
 #endif /* defined(ENABLED_DEBUG_SYNC) */
    wait_for_commit_ptr(0),
-    main_da(0, false, false),
+   main_da(0, false, false),
    m_stmt_da(&main_da)
 #ifdef WITH_WSREP
-   ,wsrep_applier(is_wsrep_applier)
-   ,wsrep_applier_closing(false)
-   ,wsrep_client_thread(false)
-   ,wsrep_apply_toi(false)
-   ,wsrep_po_handle(WSREP_PO_INITIALIZER)
-   ,wsrep_po_cnt(0)
-   ,wsrep_apply_format(0)
+  ,
+   wsrep_applier(is_wsrep_applier),
+   wsrep_applier_closing(false),
+   wsrep_client_thread(false),
+   wsrep_apply_toi(false),
+   wsrep_po_handle(WSREP_PO_INITIALIZER),
+   wsrep_po_cnt(0),
+   wsrep_apply_format(0)
 #endif
 {
   ulong tmp;
@@ -4349,7 +4350,7 @@ extern "C" int thd_binlog_format(const MYSQL_THD thd)
 {
   if (((WSREP(thd) &&  wsrep_emulate_bin_log) || mysql_bin_log.is_open()) &&
       thd->variables.option_bits & OPTION_BIN_LOG)
-    return (int) WSREP_FORMAT(thd->variables.binlog_format);
+    return (int) WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format);
   else
     return BINLOG_FORMAT_UNSPEC;
 }
@@ -5079,7 +5080,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
     binlog by filtering rules.
   */
   if (mysql_bin_log.is_open() && (variables.option_bits & OPTION_BIN_LOG) &&
-      !(WSREP_FORMAT(variables.binlog_format) == BINLOG_FORMAT_STMT &&
+      !(WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format) == BINLOG_FORMAT_STMT &&
         !binlog_filter->db_ok(db)))
   {
     /*
@@ -5289,7 +5290,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
         */
         my_error((error= ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE), MYF(0));
       }
-      else if (WSREP_FORMAT(variables.binlog_format) == BINLOG_FORMAT_ROW &&
+      else if (WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format) == BINLOG_FORMAT_ROW &&
                sqlcom_can_generate_row_events(this))
       {
         /*
@@ -5318,7 +5319,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
     else
     {
       /* binlog_format = STATEMENT */
-      if (WSREP_FORMAT(variables.binlog_format) == BINLOG_FORMAT_STMT)
+      if (WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format) == BINLOG_FORMAT_STMT)
       {
         if (lex->is_stmt_row_injection())
         {
@@ -5446,11 +5447,11 @@ int THD::decide_logging_format(TABLE_LIST *tables)
     DBUG_PRINT("info", ("decision: no logging since "
                         "mysql_bin_log.is_open() = %d "
                         "and (options & OPTION_BIN_LOG) = 0x%llx "
-                        "and binlog_format = %lu "
+                        "and binlog_format = %u "
                         "and binlog_filter->db_ok(db) = %d",
                         mysql_bin_log.is_open(),
                         (variables.option_bits & OPTION_BIN_LOG),
-                        WSREP_FORMAT(variables.binlog_format),
+                        (uint) WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format),
                         binlog_filter->db_ok(db)));
 #endif
 

sql/sql_class.h

@@ -3286,8 +3286,8 @@ public:
       tests fail and so force them to propagate the
       lex->binlog_row_based_if_mixed upwards to the caller.
     */
-    if ((WSREP_FORMAT(variables.binlog_format) == BINLOG_FORMAT_MIXED) &&
-        (in_sub_stmt == 0))
+    if ((WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format) ==
+         BINLOG_FORMAT_MIXED) && (in_sub_stmt == 0))
       set_current_stmt_binlog_format_row();
 
     DBUG_VOID_RETURN;
@@ -3338,7 +3338,8 @@ public:
                 show_system_thread(system_thread)));
     if (in_sub_stmt == 0)
     {
-      if (WSREP_FORMAT(variables.binlog_format) == BINLOG_FORMAT_ROW)
+      if (WSREP_FORMAT((enum enum_binlog_format) variables.binlog_format) ==
+          BINLOG_FORMAT_ROW)
         set_current_stmt_binlog_format_row();
       else if (temporary_tables == NULL)
         set_current_stmt_binlog_format_stmt();
@@ -3726,8 +3727,8 @@ public:
   mysql_mutex_t LOCK_wakeup_ready;
   mysql_cond_t COND_wakeup_ready;
   /*
-     The GTID assigned to the last commit. If no GTID was assigned to any commit
-     so far, this is indicated by last_commit_gtid.seq_no == 0.
+    The GTID assigned to the last commit. If no GTID was assigned to any commit
+    so far, this is indicated by last_commit_gtid.seq_no == 0.
   */
   rpl_gtid last_commit_gtid;
 
@@ -3762,25 +3763,25 @@ public:
   mysql_cond_t              COND_wsrep_thd;
   wsrep_trx_meta_t          wsrep_trx_meta;
   uint32                    wsrep_rand;
-  Relay_log_info*           wsrep_rli;
-  rpl_group_info*           wsrep_rgi;
+  Relay_log_info            *wsrep_rli;
+  rpl_group_info            *wsrep_rgi;
   wsrep_ws_handle_t         wsrep_ws_handle;
   ulong                     wsrep_retry_counter; // of autocommit
-  char*                     wsrep_retry_query;
+  char                      *wsrep_retry_query;
   size_t                    wsrep_retry_query_len;
   enum enum_server_command  wsrep_retry_command;
   enum wsrep_consistency_check_mode
                             wsrep_consistency_check;
   int                       wsrep_mysql_replicated;
-  const char*               wsrep_TOI_pre_query; /* a query to apply before
-                                                    the actual TOI query */
+  const char                *wsrep_TOI_pre_query; /* a query to apply before
+                                                     the actual TOI query */
   size_t                    wsrep_TOI_pre_query_len;
   wsrep_po_handle_t         wsrep_po_handle;
   size_t                    wsrep_po_cnt;
 #ifdef GTID_SUPPORT
   rpl_sid                   wsrep_po_sid;
 #endif /*  GTID_SUPPORT */
-  void*                     wsrep_apply_format;
+  void                      *wsrep_apply_format;
   char                      wsrep_info[128]; /* string for dynamic proc info */
 #endif /* WITH_WSREP */
 

sql/sql_parse.cc

@@ -2781,10 +2781,9 @@ mysql_execute_command(THD *thd)
     else
       res= check_access(thd, privileges_requested, any_db, NULL, NULL, 0, 0);
 
-    if (res)
-      break;
+    if (!res)
+      res= execute_sqlcom_select(thd, all_tables);
 
-    res= execute_sqlcom_select(thd, all_tables);
     break;
   }
   case SQLCOM_PREPARE:
@@ -3135,7 +3134,7 @@ mysql_execute_command(THD *thd)
        */
       if (thd->query_name_consts &&
           mysql_bin_log.is_open() &&
-          WSREP_FORMAT(thd->variables.binlog_format) == BINLOG_FORMAT_STMT &&
+          WSREP_FORMAT((enum enum_binlog_format) thd->variables.binlog_format) == BINLOG_FORMAT_STMT &&
           !mysql_bin_log.is_query_in_union(thd, thd->query_id))
       {
         List_iterator_fast<Item> it(select_lex->item_list);

sql/wsrep_thd.cc

@@ -90,7 +90,7 @@ void wsrep_client_rollback(THD *thd)
 #define NUMBER_OF_FIELDS_TO_IDENTIFY_WORKER 2
 //#include "rpl_info_factory.h"
 
-#if 0
+#ifdef NOT_USED
 static Relay_log_info* wsrep_relay_log_init(const char* log_fname)
 {
 

storage/innobase/fil/fil0pagecompress.cc

@@ -99,7 +99,6 @@ fil_decompress_page_2(
 		return;
 	}
 
-	ulint	olen = 0;
 	byte*   ptr = buf + FIL_PAGE_DATA;
 	ulint   version = mach_read_from_1(buf + FIL_PAGE_VERSION);
 	int err = 0;
@@ -206,6 +205,7 @@ fil_decompress_page_2(
 
 #ifdef HAVE_LZO
 	case PAGE_LZO_ALGORITHM: {
+                ulint olen = 0;
 		fprintf(stderr, "InnoDB: [Note]: lzo \n");
 		err = lzo1x_decompress((const unsigned char *)ptr,
 			original_len,(unsigned char *)(page_buf), &olen, NULL);
@@ -493,7 +493,6 @@ fil_decompress_page(
         ulint actual_size = 0;
 	ulint compression_alg = 0;
 	byte *in_buf;
-	ulint olen=0;
 	ulint ptype;
 
 	ut_ad(buf);
@@ -607,6 +606,8 @@ fil_decompress_page(
 #endif /* HAVE_LZ4 */
 #ifdef HAVE_LZO
 	case PAGE_LZO_ALGORITHM:
+        {
+                ulint olen=0;
 		err = lzo1x_decompress((const unsigned char *)buf+FIL_PAGE_DATA+FIL_PAGE_COMPRESSED_SIZE,
 			actual_size,(unsigned char *)in_buf, &olen, NULL);
 
@@ -621,6 +622,7 @@ fil_decompress_page(
 			ut_error;
 		}
 		break;
+        }
 #endif /* HAVE_LZO */
 #ifdef HAVE_LZMA
 	case PAGE_LZMA_ALGORITHM: {

storage/oqgraph/mysql-test/oqgraph/regression_mdev5996.result

+call mtr.add_suppression("99999999 is open on delete");
 Performing OQGraph regression test mdev5996 - using db=``, table=`999999999`
 use test;
 drop table if exists `999999999` ;

storage/oqgraph/mysql-test/oqgraph/regression_mdev5996.test

@@ -2,6 +2,8 @@
 # MidSchipDB_unstable
 --let $oqgraph_table_name= 999999999
 
+call mtr.add_suppression("99999999 is open on delete");
+
 --let $oqgraph_database_name= 
 --source regression_mdev5996.inc
 

storage/xtradb/fil/fil0pagecompress.cc

@@ -99,7 +99,6 @@ fil_decompress_page_2(
 		return;
 	}
 
-	ulint	olen = 0;
 	byte*   ptr = buf + FIL_PAGE_DATA;
 	ulint   version = mach_read_from_1(buf + FIL_PAGE_VERSION);
 	int err = 0;
@@ -206,6 +205,7 @@ fil_decompress_page_2(
 
 #ifdef HAVE_LZO
 	case PAGE_LZO_ALGORITHM: {
+	        ulint olen = 0;
 		fprintf(stderr, "InnoDB: [Note]: lzo \n");
 		err = lzo1x_decompress((const unsigned char *)ptr,
 			original_len,(unsigned char *)(page_buf), &olen, NULL);
@@ -490,7 +490,6 @@ fil_decompress_page(
         ulint actual_size = 0;
 	ulint compression_alg = 0;
 	byte *in_buf;
-	ulint olen=0;
 	ulint ptype;
 
 	ut_ad(buf);
@@ -603,7 +602,8 @@ fil_decompress_page(
 		break;
 #endif /* HAVE_LZ4 */
 #ifdef HAVE_LZO
-	case PAGE_LZO_ALGORITHM:
+	case PAGE_LZO_ALGORITHM: {
+               	ulint olen=0;
 		err = lzo1x_decompress((const unsigned char *)buf+FIL_PAGE_DATA+FIL_PAGE_COMPRESSED_SIZE,
 			actual_size,(unsigned char *)in_buf, &olen, NULL);
 
@@ -618,6 +618,7 @@ fil_decompress_page(
 			ut_error;
 		}
 		break;
+        }
 #endif /* HAVE_LZO */
 #ifdef HAVE_LZMA
 	case PAGE_LZMA_ALGORITHM: {

storage/xtradb/os/os0file.cc

@@ -6404,7 +6404,7 @@ os_file_trim(
 
 #define SECT_SIZE 512
 	size_t trim_len = UNIV_PAGE_SIZE - len;
-	os_offset_t off = slot->offset + len;
+	os_offset_t off __attribute__((unused)) = slot->offset + len;
 	// len here should be alligned to sector size
 	ut_a((trim_len % SECT_SIZE) == 0);
 	ut_a((len % SECT_SIZE) == 0);