Commit da9802e1 authored by Michael Widenius's avatar Michael Widenius

Fixed compiler warnings

client/readline.cc:
  Initialize not used variable (to kill wrong compiler warning)
mysql-test/suite/handler/aria.result:
  Updated test result
mysql-test/suite/handler/handler.inc:
  Changed index to ensure rows are in a fixed order
mysql-test/suite/handler/heap.result:
  Updated test result
mysql-test/suite/handler/innodb.result:
  Updated test result
mysql-test/suite/handler/myisam.result:
  Updated test result
plugin/handler_socket/handlersocket/Makefile.am:
  Use CXX flags to compile
sql/filesort.cc:
  Initialize variable that may be used
sql/log.cc:
  Initialize not used variable (to kill wrong compiler warning)
sql/opt_range_mrr.cc:
  Fixed cast to avoid compiler warning
storage/xtradb/fil/fil0fil.c:
  Added cast to avoid compiler warning
parent 02601c8f
...@@ -47,6 +47,7 @@ char *batch_readline(LINE_BUFFER *line_buff, bool *truncated) ...@@ -47,6 +47,7 @@ char *batch_readline(LINE_BUFFER *line_buff, bool *truncated)
char *pos; char *pos;
ulong out_length; ulong out_length;
DBUG_ASSERT(truncated != NULL); DBUG_ASSERT(truncated != NULL);
LINT_INIT(out_length);
if (!(pos=intern_read_line(line_buff,&out_length, truncated))) if (!(pos=intern_read_line(line_buff,&out_length, truncated)))
return 0; return 0;
......
...@@ -329,7 +329,7 @@ a b ...@@ -329,7 +329,7 @@ a b
16 ccc 16 ccc
16 xxx 16 xxx
deallocate prepare stmt; deallocate prepare stmt;
prepare stmt from 'handler t1 read a>=(?) where a < ? limit 5'; prepare stmt from 'handler t1 read b>=(?) where a < ? limit 5';
set @a=17, @b=24; set @a=17, @b=24;
execute stmt using @a,@b; execute stmt using @a,@b;
a b a b
......
...@@ -195,7 +195,7 @@ execute stmt using @a; ...@@ -195,7 +195,7 @@ execute stmt using @a;
execute stmt using @a; execute stmt using @a;
deallocate prepare stmt; deallocate prepare stmt;
prepare stmt from 'handler t1 read a>=(?) where a < ? limit 5'; prepare stmt from 'handler t1 read b>=(?) where a < ? limit 5';
set @a=17, @b=24; set @a=17, @b=24;
execute stmt using @a,@b; execute stmt using @a,@b;
execute stmt using @a,@b; execute stmt using @a,@b;
......
...@@ -329,7 +329,7 @@ a b ...@@ -329,7 +329,7 @@ a b
16 ccc 16 ccc
16 xxx 16 xxx
deallocate prepare stmt; deallocate prepare stmt;
prepare stmt from 'handler t1 read a>=(?) where a < ? limit 5'; prepare stmt from 'handler t1 read b>=(?) where a < ? limit 5';
set @a=17, @b=24; set @a=17, @b=24;
execute stmt using @a,@b; execute stmt using @a,@b;
a b a b
......
...@@ -329,7 +329,7 @@ a b ...@@ -329,7 +329,7 @@ a b
16 ccc 16 ccc
16 xxx 16 xxx
deallocate prepare stmt; deallocate prepare stmt;
prepare stmt from 'handler t1 read a>=(?) where a < ? limit 5'; prepare stmt from 'handler t1 read b>=(?) where a < ? limit 5';
set @a=17, @b=24; set @a=17, @b=24;
execute stmt using @a,@b; execute stmt using @a,@b;
a b a b
......
...@@ -329,7 +329,7 @@ a b ...@@ -329,7 +329,7 @@ a b
16 ccc 16 ccc
16 xxx 16 xxx
deallocate prepare stmt; deallocate prepare stmt;
prepare stmt from 'handler t1 read a>=(?) where a < ? limit 5'; prepare stmt from 'handler t1 read b>=(?) where a < ? limit 5';
set @a=17, @b=24; set @a=17, @b=24;
execute stmt using @a,@b; execute stmt using @a,@b;
a b a b
......
CXXFLAGS += -fimplicit-templates
pkgplugindir = $(PLUGIN_DIR) pkgplugindir = $(PLUGIN_DIR)
noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp
pkgplugin_LTLIBRARIES = handlersocket.la pkgplugin_LTLIBRARIES = handlersocket.la
handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la
handlersocket_la_CFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CFLAGS) \ handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -fimplicit-templates -I$(srcdir)/../libhsclient
-I$(srcdir)/../libhsclient
handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CFLAGS) \
-I$(srcdir)/../libhsclient
handlersocket_la_SOURCES = database.cpp handlersocket.cpp \ handlersocket_la_SOURCES = database.cpp handlersocket.cpp \
hstcpsvr_worker.cpp hstcpsvr.cpp hstcpsvr_worker.cpp hstcpsvr.cpp
...@@ -1215,7 +1215,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, ...@@ -1215,7 +1215,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
QUEUE queue; QUEUE queue;
qsort2_cmp cmp; qsort2_cmp cmp;
void *first_cmp_arg; void *first_cmp_arg;
element_count dupl_count; element_count dupl_count= 0;
uchar *src; uchar *src;
THD::killed_state not_killable; THD::killed_state not_killable;
uchar *unique_buff= param->unique_buff; uchar *unique_buff= param->unique_buff;
......
...@@ -1899,6 +1899,7 @@ static int find_uniq_filename(char *name) ...@@ -1899,6 +1899,7 @@ static int find_uniq_filename(char *name)
size_t buf_length, length; size_t buf_length, length;
char *start, *end; char *start, *end;
DBUG_ENTER("find_uniq_filename"); DBUG_ENTER("find_uniq_filename");
LINT_INIT(number);
length= dirname_part(buff, name, &buf_length); length= dirname_part(buff, name, &buf_length);
start= name + length; start= name + length;
......
...@@ -225,7 +225,7 @@ bool sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range) ...@@ -225,7 +225,7 @@ bool sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range)
RANGE_SEQ_ENTRY *cur= &seq->stack[seq->i]; RANGE_SEQ_ENTRY *cur= &seq->stack[seq->i];
uint min_key_length= cur->min_key - seq->param->min_key; uint min_key_length= cur->min_key - seq->param->min_key;
range->ptr= (char*)(int)(key_tree->part); range->ptr= (char*)(intptr)(key_tree->part);
if (cur->min_key_flag & GEOM_FLAG) if (cur->min_key_flag & GEOM_FLAG)
{ {
range->range_flag= cur->min_key_flag; range->range_flag= cur->min_key_flag;
......
...@@ -3313,7 +3313,7 @@ fil_open_single_table_tablespace( ...@@ -3313,7 +3313,7 @@ fil_open_single_table_tablespace(
} }
if (page_is_corrupt) { if (page_is_corrupt) {
fprintf(stderr, " [errp:%lld]", offset / UNIV_PAGE_SIZE); fprintf(stderr, " [errp:%lld]", (longlong) (offset / UNIV_PAGE_SIZE));
/* cannot treat corrupt page */ /* cannot treat corrupt page */
goto skip_write; goto skip_write;
......
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