Commit fc17efc2 authored by Sergei Golubchik's avatar Sergei Golubchik

compiler warnings

parent d364e64a
...@@ -1369,7 +1369,6 @@ os_file_set_nocache( ...@@ -1369,7 +1369,6 @@ os_file_set_nocache(
#endif #endif
static int os_file_set_atomic_writes(os_file_t file, const char *name) static int os_file_set_atomic_writes(os_file_t file, const char *name)
{ {
static int first_time = 1;
int atomic_option = 1; int atomic_option = 1;
int ret = ioctl (file, DFS_IOCTL_ATOMIC_WRITE_SET, &atomic_option); int ret = ioctl (file, DFS_IOCTL_ATOMIC_WRITE_SET, &atomic_option);
...@@ -2027,7 +2026,7 @@ os_file_set_size( ...@@ -2027,7 +2026,7 @@ os_file_set_size(
"InnoDB: Error: preallocating data for" "InnoDB: Error: preallocating data for"
" file %s failed at\n" " file %s failed at\n"
"InnoDB: offset 0 size %lld %lld. Operating system" "InnoDB: offset 0 size %lld %lld. Operating system"
" error number %llu.\n" " error number %d.\n"
"InnoDB: Check that the disk is not full" "InnoDB: Check that the disk is not full"
" or a disk quota exceeded.\n" " or a disk quota exceeded.\n"
"InnoDB: Some operating system error numbers" "InnoDB: Some operating system error numbers"
......
...@@ -1246,17 +1246,13 @@ static int check_dynamic_record(HA_CHECK *param, MARIA_HA *info, int extend, ...@@ -1246,17 +1246,13 @@ static int check_dynamic_record(HA_CHECK *param, MARIA_HA *info, int extend,
{ {
MARIA_BLOCK_INFO block_info; MARIA_BLOCK_INFO block_info;
MARIA_SHARE *share= info->s; MARIA_SHARE *share= info->s;
my_off_t start_recpos, start_block, pos; my_off_t UNINIT_VAR(start_recpos), start_block, pos;
uchar *to; uchar *UNINIT_VAR(to);
ulong left_length; ulong UNINIT_VAR(left_length);
uint b_type; uint b_type;
char llbuff[22],llbuff2[22],llbuff3[22]; char llbuff[22],llbuff2[22],llbuff3[22];
DBUG_ENTER("check_dynamic_record"); DBUG_ENTER("check_dynamic_record");
LINT_INIT(left_length);
LINT_INIT(start_recpos);
LINT_INIT(to);
pos= 0; pos= 0;
while (pos < share->state.state.data_file_length) while (pos < share->state.state.data_file_length)
{ {
...@@ -1847,10 +1843,8 @@ static int check_block_record(HA_CHECK *param, MARIA_HA *info, int extend, ...@@ -1847,10 +1843,8 @@ static int check_block_record(HA_CHECK *param, MARIA_HA *info, int extend,
pos < share->state.state.data_file_length; pos < share->state.state.data_file_length;
pos+= block_size, page++) pos+= block_size, page++)
{ {
uint row_count, real_row_count, empty_space, page_type, bitmap_pattern; uint UNINIT_VAR(row_count), real_row_count, empty_space, page_type, bitmap_pattern;
uint bitmap_for_page; uint bitmap_for_page;
LINT_INIT(row_count);
LINT_INIT(empty_space);
if (_ma_killed_ptr(param)) if (_ma_killed_ptr(param))
{ {
......
...@@ -758,13 +758,11 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon) ...@@ -758,13 +758,11 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon)
struct st_state_copy *state_copies= NULL, /**< fixed-size cache of states */ struct st_state_copy *state_copies= NULL, /**< fixed-size cache of states */
*state_copies_end, /**< cache ends here */ *state_copies_end, /**< cache ends here */
*state_copy; /**< iterator in cache */ *state_copy; /**< iterator in cache */
TRANSLOG_ADDRESS state_copies_horizon; /**< horizon of states' _copies_ */ TRANSLOG_ADDRESS UNINIT_VAR(state_copies_horizon); /**< horizon of states' _copies_ */
struct st_filter_param filter_param; struct st_filter_param filter_param;
PAGECACHE_FLUSH_FILTER filter; PAGECACHE_FLUSH_FILTER filter;
DBUG_ENTER("collect_tables"); DBUG_ENTER("collect_tables");
LINT_INIT(state_copies_horizon);
/* let's make a list of distinct shares */ /* let's make a list of distinct shares */
mysql_mutex_lock(&THR_LOCK_maria); mysql_mutex_lock(&THR_LOCK_maria);
for (nb= 0, pos= maria_open_list; pos; pos= pos->next) for (nb= 0, pos= maria_open_list; pos; pos= pos->next)
......
...@@ -185,18 +185,14 @@ static int split_maria_rtree_node(SplitStruct *node, int n_entries, ...@@ -185,18 +185,14 @@ static int split_maria_rtree_node(SplitStruct *node, int n_entries,
double **d_buffer, int n_dim) double **d_buffer, int n_dim)
{ {
SplitStruct *cur; SplitStruct *cur;
SplitStruct *a; SplitStruct *UNINIT_VAR(a);
SplitStruct *b; SplitStruct *UNINIT_VAR(b);
double *g1= reserve_coords(d_buffer, n_dim); double *g1= reserve_coords(d_buffer, n_dim);
double *g2= reserve_coords(d_buffer, n_dim); double *g2= reserve_coords(d_buffer, n_dim);
SplitStruct *next; SplitStruct *UNINIT_VAR(next);
int next_node; int UNINIT_VAR(next_node);
int i; int i;
SplitStruct *end= node + n_entries; SplitStruct *end= node + n_entries;
LINT_INIT(a);
LINT_INIT(b);
LINT_INIT(next);
LINT_INIT(next_node);
if (all_size < min_size * 2) if (all_size < min_size * 2)
{ {
......
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