Merge with fixes for compiler warnings and 2 fixed test cases

Fixed some additional compiler warnings from OpenSolaris build.


extra/libevent/devpoll.c:
  Fixed compiler warning
mysys/my_file.c:
  Fixed compiler warning
sql/mysqld.cc:
  Fixed compiler warning
sql/rpl_record.cc:
  Removed not used variable
storage/maria/ma_blockrec.c:
  Fixed compiler warning
storage/xtradb/buf/buf0buf.c:
  Fixed compiler warning
storage/xtradb/handler/i_s.cc:
  Fixed compiler warning
support-files/compiler_warnings.supp:
  Added suppression of compiler warnings in InnoDB/XtraDB
  Added suppression of compiler warnings that can safely be ignored.

extra/libevent/devpoll.c

@@ -140,7 +140,7 @@ devpoll_init(struct event_base *base)
 		return (NULL);
 
 	if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
-	    rl.rlim_cur != RLIM_INFINITY)
+	    (unsigned long long) rl.rlim_cur != (unsigned long long) RLIM_INFINITY)
 		nfiles = rl.rlim_cur - 1;
 
 	/* Initialize the kernel queue */

include/ft_global.h

@@ -62,7 +62,8 @@ void ft_free_stopwords(void);
 #define FT_SORTED 2
 #define FT_EXPAND 4   /* query expansion */
 
-FT_INFO *ft_init_search(uint,void *, uint, uchar *, uint,CHARSET_INFO *, uchar *);
+FT_INFO *ft_init_search(uint,void *, uint, uchar *, size_t,
+                        CHARSET_INFO *, uchar *);
 my_bool ft_boolean_check_syntax_string(const uchar *);
 
 /* Internal symbols for fulltext between maria and MyISAM */

include/maria.h

@@ -462,7 +462,7 @@ void maria_versioning(MARIA_HA *info, my_bool versioning);
 void maria_ignore_trids(MARIA_HA *info);
 
 /* fulltext functions */
-FT_INFO *maria_ft_init_search(uint,void *, uint, uchar *, uint,
+FT_INFO *maria_ft_init_search(uint,void *, uint, uchar *, size_t,
                               CHARSET_INFO *, uchar *);
 
 /* 'Almost-internal' Maria functions */

mysql-test/r/show_check.result

@@ -252,13 +252,11 @@ drop table t1;
 flush tables;
 show open tables;
 Database	Table	In_use	Name_locked
-mysql	general_log	0	0
 create table t1(n int);
 insert into t1 values (1);
 show open tables;
 Database	Table	In_use	Name_locked
 test	t1	0	0
-mysql	general_log	0	0
 drop table t1;
 create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" ENGINE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed;
 show create table t1;

mysql-test/suite/rpl/t/rpl_rotate_logs.test

@@ -153,7 +153,7 @@ disable_query_log;
 while ($1)
 {
 #eval means expand $ expressions
- eval insert into t3 values($1 + 4);
+ eval insert HIGH_PRIORITY into t3 values($1 + 4);
  dec $1;
 }
 enable_query_log;

mysql-test/t/show_check-master.opt

---log-output=table --slow-query-log --log-long-format --log-queries-not-using-indexes --myisam-recover="" --general-log --general-log-file="" --slow-query-log-file=""
+--log-output=file --slow-query-log --log-long-format --log-queries-not-using-indexes --myisam-recover="" --general-log --general-log-file="foo" --slow-query-log-file=""

mysys/my_file.c

@@ -51,7 +51,7 @@ static uint set_max_open_files(uint max_file_limit)
     DBUG_PRINT("info", ("rlim_cur: %u  rlim_max: %u",
 			(uint) rlimit.rlim_cur,
 			(uint) rlimit.rlim_max));
-    if (rlimit.rlim_cur == RLIM_INFINITY)
+    if ((ulonglong) rlimit.rlim_cur == (ulonglong) RLIM_INFINITY)
       rlimit.rlim_cur = max_file_limit;
     if (rlimit.rlim_cur >= max_file_limit)
       DBUG_RETURN(rlimit.rlim_cur);		/* purecov: inspected */

sql/item.cc

@@ -7119,7 +7119,7 @@ double Item_cache_decimal::val_real()
   DBUG_ASSERT(fixed);
   double res;
   if (!value_cached && !cache_value())
-    return NULL;
+    return 0.0;
   my_decimal2double(E_DEC_FATAL_ERROR, &decimal_value, &res);
   return res;
 }

sql/mysqld.cc

@@ -2704,7 +2704,7 @@ static void init_signals(void)
   {
     /* Change limits so that we will get a core file */
     STRUCT_RLIMIT rl;
-    rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
+    rl.rlim_cur = rl.rlim_max = (rlim_t) RLIM_INFINITY;
     if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings)
       sql_print_warning("setrlimit could not change the size of core files to 'infinity';  We may not be able to generate a core file on signals");
   }

sql/rpl_record.cc

@@ -366,7 +366,6 @@ int prepare_record(TABLE *const table,
   */
   for (Field **field_ptr= table->field+skip; *field_ptr; ++field_ptr)
   {
-    uint32 const mask= NOT_NULL_FLAG | NO_DEFAULT_VALUE_FLAG;
     Field *const f= *field_ptr;
     if ((f->flags &  NO_DEFAULT_VALUE_FLAG) &&
         (f->real_type() != MYSQL_TYPE_ENUM))

storage/maria/ft_maria.c

@@ -22,8 +22,8 @@
 #include "ma_ftdefs.h"
 
 FT_INFO *maria_ft_init_search(uint flags, void *info, uint keynr,
-			      uchar *query, uint query_len, CHARSET_INFO *cs,
-			      uchar *record)
+			      uchar *query, size_t query_len,
+                              CHARSET_INFO *cs, uchar *record)
 {
   FT_INFO *res;
   if (flags & FT_BOOL)

storage/maria/ma_blockrec.c

@@ -1688,7 +1688,8 @@ static my_bool get_head_or_tail_page(MARIA_HA *info,
     if (!page_link.changed)
       goto crashed;
 
-    DBUG_ASSERT((res->buff[PAGE_TYPE_OFFSET] & PAGE_TYPE_MASK) == page_type);
+    DBUG_ASSERT((uint) (res->buff[PAGE_TYPE_OFFSET] & PAGE_TYPE_MASK) ==
+                page_type);
     if (!(dir= find_free_position(page_type == HEAD_PAGE ? info : 0,
                                   res->buff, block_size, &res->rownr,
                                   &res->length, &res->empty_space)))

storage/myisam/ft_boolean_search.c

@@ -299,7 +299,7 @@ static int ftb_parse_query_internal(MYSQL_FTPARSER_PARAM *param,
 }
 
 
-static int _ftb_parse_query(FTB *ftb, uchar *query, uint len,
+static int _ftb_parse_query(FTB *ftb, uchar *query, mysql_ft_size_t len,
                             struct st_mysql_ftparser *parser)
 {
   MYSQL_FTPARSER_PARAM *param;
@@ -540,7 +540,7 @@ static void _ftb_init_index_search(FT_INFO *ftb)
 
 
 FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, uchar *query,
-                                 uint query_len, CHARSET_INFO *cs)
+                                 mysql_ft_size_t query_len, CHARSET_INFO *cs)
 {
   FTB       *ftb;
   FTB_EXPR  *ftbe;
@@ -679,8 +679,9 @@ static int ftb_check_phrase_internal(MYSQL_FTPARSER_PARAM *param,
     -1 is returned if error occurs.
 */
 
-static int _ftb_check_phrase(FTB *ftb, const uchar *document, uint len,
-                FTB_EXPR *ftbe, struct st_mysql_ftparser *parser)
+static int _ftb_check_phrase(FTB *ftb, const uchar *document,
+                             mysql_ft_size_t len,
+                             FTB_EXPR *ftbe, struct st_mysql_ftparser *parser)
 {
   MY_FTB_PHRASE_PARAM ftb_param;
   MYSQL_FTPARSER_PARAM *param;

storage/myisam/ft_myisam.c

@@ -23,8 +23,8 @@
 #include "ftdefs.h"
 
 FT_INFO *ft_init_search(uint flags, void *info, uint keynr,
-                        uchar *query, uint query_len, CHARSET_INFO *cs,
-                        uchar *record)
+                        uchar *query, size_t query_len,
+                        CHARSET_INFO *cs, uchar *record)
 {
   FT_INFO *res;
   if (flags & FT_BOOL)

storage/myisam/ft_nlq_search.c

@@ -204,7 +204,8 @@ static int FT_DOC_cmp(void *unused __attribute__((unused)),
 
 
 FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, uchar *query,
-			    uint query_len, uint flags, uchar *record)
+			    mysql_ft_size_t query_len, uint flags,
+                            uchar *record)
 {
   TREE	      wtree;
   ALL_IN_ONE  aio;

storage/myisam/ft_parser.c

@@ -304,7 +304,7 @@ static int ft_parse_internal(MYSQL_FTPARSER_PARAM *param,
 }
 
 
-int ft_parse(TREE *wtree, const uchar *doc, int doclen,
+int ft_parse(TREE *wtree, const uchar *doc, mysql_ft_size_t doclen,
              struct st_mysql_ftparser *parser,
              MYSQL_FTPARSER_PARAM *param, MEM_ROOT *mem_root)
 {

storage/myisam/ft_stopwords.c

@@ -21,7 +21,7 @@
 typedef struct st_ft_stopwords
 {
   const char * pos;
-  uint   len;
+  size_t len;
 } FT_STOPWORD;
 
 static TREE *stopwords3=NULL;

storage/myisam/ftdefs.h

@@ -97,8 +97,8 @@
 
 typedef struct st_ft_word {
   const uchar *pos;
-  uint	 len;
   double weight;
+  size_t len;
 } FT_WORD;
 
 int is_stopword(const uchar *word, size_t len);
@@ -111,7 +111,8 @@ uchar ft_simple_get_word(CHARSET_INFO *, const uchar **, const uchar *,
                          FT_WORD *, my_bool);
 
 typedef struct _st_ft_seg_iterator {
-  uint        num, len;
+  uint        num;
+  mysql_ft_size_t len;
   HA_KEYSEG  *seg;
   const uchar *rec, *pos;
 } FT_SEG_ITERATOR;
@@ -128,8 +129,9 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, const uchar *, MEM_ROOT *);
 uint _mi_ft_parse(TREE *, MI_INFO *, uint, const uchar *,
                   MYSQL_FTPARSER_PARAM *, MEM_ROOT *);
 
-FT_INFO *ft_init_nlq_search(MI_INFO *, uint, uchar *, uint, uint, uchar *);
-FT_INFO *ft_init_boolean_search(MI_INFO *, uint, uchar *, uint, CHARSET_INFO *);
+FT_INFO *ft_init_nlq_search(MI_INFO *, uint, uchar *, mysql_ft_size_t, uint,
+                            uchar *);
+FT_INFO *ft_init_boolean_search(MI_INFO *, uint, uchar *, mysql_ft_size_t, CHARSET_INFO *);
 
 extern const struct _ft_vft _ft_vft_nlq;
 int ft_nlq_read_next(FT_INFO *, char *);

storage/xtradb/buf/buf0buf.c

@@ -76,10 +76,10 @@ inline void _increment_page_get_statistics(buf_block_t* block, trx_t* trx)
 					block->page.offset, DPAH_SIZE << 3);
 	block_hash_byte = block_hash >> 3;
 	block_hash_offset = (byte) block_hash & 0x07;
-	if (block_hash_byte < 0 || block_hash_byte >= DPAH_SIZE)
-		fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %lu !!!\n", block_hash_byte, block_hash_offset);
-	if (block_hash_offset < 0 || block_hash_offset > 7)
-		fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %lu !!!\n", block_hash_byte, block_hash_offset);
+	if (block_hash_byte >= DPAH_SIZE)
+          fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %lu !!!\n", (unsigned long) block_hash_byte, (unsigned long) block_hash_offset);
+	if (block_hash_offset > 7)
+          fprintf(stderr, "!!! block_hash_byte = %lu  block_hash_offset = %lu !!!\n", (unsigned long) block_hash_byte, (unsigned long) block_hash_offset);
 	if ((trx->distinct_page_access_hash[block_hash_byte] & ((byte) 0x01 << block_hash_offset)) == 0)
 		trx->distinct_page_access++;
 	trx->distinct_page_access_hash[block_hash_byte] |= (byte) 0x01 << block_hash_offset;

storage/xtradb/handler/i_s.cc

@@ -2992,7 +2992,7 @@ i_s_innodb_admin_command_fill(
 	char**	query_str;
 	char*	ptr;
 	char	quote	= '\0';
-	char*	command_head = "XTRA_";
+	const char*	command_head = "XTRA_";
 
 	DBUG_ENTER("i_s_innodb_admin_command_fill");
 

support-files/compiler_warnings.supp

@@ -28,6 +28,12 @@ pars0lex.l: .*conversion from 'ulint' to 'int', possible loss of data.*
 btr/btr0cur\.c: .*value computed is not used.*: 3175-3375
 include/buf0buf\.ic: unused parameter ‘mtr’
 fil/fil0fil\.c: comparison between signed and unsigned : 3100-3199
+fil/fil0fil\.c: unused parameter
+log/log0recv\.c: unused variable
+os/os0file\.c: unused parameter
+handler/i_s\.cc: unused variable
+sync/sync0rw\.c: unused parameter
+sync/sync0sync\.c: unused parameter
 
 #
 # bdb is not critical to keep up to date
@@ -49,6 +55,11 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.*
 .*/extra/libevent/.* : .*unused parameter.*
 .*/extra/libevent/select\.c : .*comparison between signed and unsigned.* : 270-280
 
+#
+# Ignore warnings from system libraries
+#
+/usr/share/aclocal/audiofile.m4 : .*
+
 #
 # Ignore all conversion warnings on windows 64
 # (Is safe as we are not yet supporting strings >= 2G)
@@ -102,6 +113,8 @@ include/runtime.hpp: .*pure_error.*
 #
 listener.cc : .*conversion from 'SOCKET' to 'int'.*
 net_serv.cc : .*conversion from 'SOCKET' to 'int'.*
+set_var.cc:  right-hand operand of comma has no effect : 1000-1400
+
 
 # allow a little moving space for the warning below
 mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 560-600