Commit f60106f8 authored by Davi Arnaut's avatar Davi Arnaut

Bug#45288: pb2 returns a lot of compilation warnings on linux

Fix assorted compiler warnings.

sql/mysqld.cc:
  Do not declare max_page_size twice. If large pages support
  is enabled, the code expects the size in max_desired_page_size.
storage/innobase/include/ibuf0ibuf.h:
  Remove trailing comma. Only present in C99.
  
  Approved by: Vasil (via IRC)
storage/innobase/include/row0row.h:
  Remove trailing comma. Only present in C99.
  
  Approved by: Vasil (via IRC)
strings/my_vsnprintf.c:
  No need to assert the obvious.
parent 3fdcf206
...@@ -3244,12 +3244,11 @@ static int init_common_variables() ...@@ -3244,12 +3244,11 @@ static int init_common_variables()
desired page sizes. desired page sizes.
*/ */
int nelem; int nelem;
int max_desired_page_size; size_t max_desired_page_size;
int max_page_size;
if (opt_super_large_pages) if (opt_super_large_pages)
max_page_size= SUPER_LARGE_PAGESIZE; max_desired_page_size= SUPER_LARGE_PAGESIZE;
else else
max_page_size= LARGE_PAGESIZE; max_desired_page_size= LARGE_PAGESIZE;
nelem = getpagesizes(NULL, 0); nelem = getpagesizes(NULL, 0);
if (nelem > 0) if (nelem > 0)
{ {
......
...@@ -43,7 +43,7 @@ typedef enum { ...@@ -43,7 +43,7 @@ typedef enum {
IBUF_OP_DELETE = 2, IBUF_OP_DELETE = 2,
/* Number of different operation types. */ /* Number of different operation types. */
IBUF_OP_COUNT = 3, IBUF_OP_COUNT = 3
} ibuf_op_t; } ibuf_op_t;
/** Combinations of operations that can be buffered. Because the enum /** Combinations of operations that can be buffered. Because the enum
......
...@@ -267,7 +267,7 @@ enum row_search_result { ...@@ -267,7 +267,7 @@ enum row_search_result {
secondary index leaf page was not in secondary index leaf page was not in
the buffer pool, and the operation was the buffer pool, and the operation was
enqueued in the insert/delete buffer */ enqueued in the insert/delete buffer */
ROW_NOT_DELETED_REF, /*!< BTR_DELETE was specified, and ROW_NOT_DELETED_REF /*!< BTR_DELETE was specified, and
row_purge_poss_sec() failed */ row_purge_poss_sec() failed */
}; };
......
...@@ -513,7 +513,7 @@ start: ...@@ -513,7 +513,7 @@ start:
arg_count= max(arg_count, arg_index); arg_count= max(arg_count, arg_index);
goto start; goto start;
} }
DBUG_ASSERT(0);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment