automatic merge

client/readline.cc

@@ -47,6 +47,7 @@ char *batch_readline(LINE_BUFFER *line_buff, bool *truncated)
   char *pos;
   ulong out_length;
   DBUG_ASSERT(truncated != NULL);
+  LINT_INIT(out_length);
 
   if (!(pos=intern_read_line(line_buff,&out_length, truncated)))
     return 0;

mysql-test/suite/handler/aria.result

@@ -329,7 +329,7 @@ a	b
 16	ccc
 16	xxx
 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;
 execute stmt using @a,@b;
 a	b

mysql-test/suite/handler/handler.inc

@@ -195,7 +195,7 @@ execute stmt using @a;
 execute stmt using @a;
 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;
 execute stmt using @a,@b;
 execute stmt using @a,@b;

mysql-test/suite/handler/heap.result

@@ -329,7 +329,7 @@ a	b
 16	ccc
 16	xxx
 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;
 execute stmt using @a,@b;
 a	b

mysql-test/suite/handler/innodb.result

@@ -329,7 +329,7 @@ a	b
 16	ccc
 16	xxx
 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;
 execute stmt using @a,@b;
 a	b

mysql-test/suite/handler/myisam.result

@@ -329,7 +329,7 @@ a	b
 16	ccc
 16	xxx
 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;
 execute stmt using @a,@b;
 a	b

plugin/handler_socket/handlersocket/Makefile.am

-CXXFLAGS += -fimplicit-templates
 pkgplugindir =  $(PLUGIN_DIR)
 noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp
 pkgplugin_LTLIBRARIES = handlersocket.la
 handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la
-handlersocket_la_CFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CFLAGS) \
-	-I$(srcdir)/../libhsclient
-handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CFLAGS) \
-	-I$(srcdir)/../libhsclient
+handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -fimplicit-templates -I$(srcdir)/../libhsclient
 handlersocket_la_SOURCES = database.cpp handlersocket.cpp \
 	hstcpsvr_worker.cpp hstcpsvr.cpp

sql/filesort.cc

@@ -1215,7 +1215,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
   QUEUE queue;
   qsort2_cmp cmp;
   void *first_cmp_arg;
-  element_count dupl_count;
+  element_count dupl_count= 0;
   uchar *src;
   THD::killed_state not_killable;
   uchar *unique_buff= param->unique_buff;

sql/log.cc

@@ -1899,6 +1899,7 @@ static int find_uniq_filename(char *name)
   size_t		buf_length, length;
   char			*start, *end;
   DBUG_ENTER("find_uniq_filename");
+  LINT_INIT(number);
 
   length= dirname_part(buff, name, &buf_length);
   start=  name + length;

sql/opt_range_mrr.cc

@@ -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];
   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)
   {
     range->range_flag= cur->min_key_flag;

storage/xtradb/fil/fil0fil.c

@@ -3313,7 +3313,7 @@ fil_open_single_table_tablespace(
 				}
 
 				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 */
 					goto skip_write;