Bug#13945257 NEW COMPILATION ERRORS/WARNINGS WITH XCODE 4.3.2

jhauglid · jhauglid · commit f13c3059655a · 2012-04-27T13:57:38.000+02:00
Fix various new compiler warnings and one compiler error
reported by Clang 3.1 / XCode 4.3.2 of Mac OSX.

See per-file messages for details.
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
@@ -448,7 +448,8 @@ static MYSQL_RES * emb_store_result(MYSQL *mysql)
 int emb_read_change_user_result(MYSQL *mysql)
 {
   mysql->net.read_pos= (uchar*)""; // fake an OK packet
-  return mysql_errno(mysql) ? packet_error : 1 /* length of the OK packet */;
+  return mysql_errno(mysql) ? static_cast<int>packet_error :
+                              1 /* length of the OK packet */;
 }
 
 MYSQL_METHODS embedded_methods= 
diff --git a/sql/field.cc b/sql/field.cc
@@ -5565,7 +5565,7 @@ Field_time_common::convert_number_to_TIME(longlong nr, bool unsigned_val,
     Both number_to_time() call and negative nanoseconds value
     affect ltime->neg, hence "|=" to combine them:
   */
-  if (ltime->neg|= (nanoseconds < 0))
+  if ((ltime->neg|= (nanoseconds < 0)))
     nanoseconds= -nanoseconds;
   ltime->second_part= 0;
   return time_add_nanoseconds_with_round(ltime, nanoseconds, warnings);
diff --git a/sql/item_buff.cc b/sql/item_buff.cc
@@ -129,7 +129,7 @@ bool Cached_item_int::cmp(void)
 {
   DBUG_ENTER("Cached_item_int::cmp");
   longlong nr=item->val_int();
-  DBUG_PRINT("info", ("old: %Ld, new: %Ld", value, nr));
+  DBUG_PRINT("info", ("old: %lld, new: %lld", value, nr));
   if (null_value != item->null_value || nr != value)
   {
     null_value= item->null_value;
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
@@ -2792,7 +2792,7 @@ bool Item_func_timediff::get_time(MYSQL_TIME *l_time3)
   if (l_time1.neg != l_time2.neg)
     l_sign= -l_sign;
 
-  memset(l_time3, 0, sizeof(l_time3));
+  memset(l_time3, 0, sizeof(*l_time3));
   
   l_time3->neg= calc_time_diff(&l_time1, &l_time2, l_sign,
                                &seconds, &microseconds);
diff --git a/sql/log.cc b/sql/log.cc
@@ -1423,7 +1423,7 @@ static int find_uniq_filename(char *name)
   my_dirend(dir_info);
 
   /* check if reached the maximum possible extension number */
-  if ((max_found == MAX_LOG_UNIQUE_FN_EXT))
+  if (max_found == MAX_LOG_UNIQUE_FN_EXT)
   {
     sql_print_error("Log filename extension number exhausted: %06lu. \
 Please fix this by archiving old logs and \
diff --git a/sql/log_event.cc b/sql/log_event.cc
@@ -1316,7 +1316,8 @@ Log_event* Log_event::read_log_event(IO_CACHE* file,
   Log_event *res=  0;
 #ifndef max_allowed_packet
   THD *thd=current_thd;
-  uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~(ulong)0;
+  ulong max_allowed_packet= thd ? thd->variables.max_allowed_packet :
+                                  ~(ulong)0;
 #endif
 
   ulong const max_size=
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
@@ -81,7 +81,7 @@ static ulonglong get_exact_record_count(TABLE_LIST *tables)
   for (TABLE_LIST *tl= tables; tl; tl= tl->next_leaf)
   {
     ha_rows tmp= tl->table->file->records();
-    if ((tmp == HA_POS_ERROR))
+    if (tmp == HA_POS_ERROR)
       return ULONGLONG_MAX;
     count*= tmp;
   }
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
@@ -528,7 +528,7 @@ static bool lldiv_t_to_time(lldiv_t lld, MYSQL_TIME *ltime, int *warnings)
     Both lld.quot and lld.rem can give negative result value,
     thus combine them using "|=".
   */
-  if (ltime->neg|= (lld.rem < 0))
+  if ((ltime->neg|= (lld.rem < 0)))
     lld.rem= -lld.rem;
   ltime->second_part= lld.rem / 1000;
   return time_add_nanoseconds_with_round(ltime, lld.rem % 1000, warnings);
diff --git a/sql/table.h b/sql/table.h
@@ -900,7 +900,11 @@ typedef Bitmap<MAX_FIELDS> Field_map;
 struct TABLE
 {
   TABLE() {}                               /* Remove gcc warning */
-  virtual ~TABLE() {}
+  /*
+    Since TABLE instances are often cleared using memset(), do not
+    add virtual members and do not inherit from TABLE.
+    Otherwise memset() will start overwriting the vtable pointer.
+  */
 
   TABLE_SHARE	*s;
   handler	*file;
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
@@ -1417,9 +1417,9 @@ int ha_tina::rnd_end()
       DBUG_RETURN(-1);
 
     /* Open the file again */
-    if (((data_file= mysql_file_open(csv_key_file_data,
-                                     share->data_file_name,
-                                     O_RDONLY, MYF(MY_WME))) == -1))
+    if ((data_file= mysql_file_open(csv_key_file_data,
+                                    share->data_file_name,
+                                    O_RDONLY, MYF(MY_WME))) == -1)
       DBUG_RETURN(my_errno ? my_errno : -1);
     /*
       As we reopened the data file, increase share->data_file_version 
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
@@ -825,7 +825,7 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
         user:@hostname:port/db/table
         Then password is a null string, so set to NULL
       */
-      if ((share->password[0] == '\0'))
+      if (share->password[0] == '\0')
         share->password= NULL;
     }
     else
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
@@ -1770,7 +1770,7 @@ fil_set_max_space_id_if_bigger(
 Writes the flushed lsn and the latest archived log number to the page header
 of the first page of a data file of the system tablespace (space 0),
 which is uncompressed. */
-static __attribute__((nonnull, warn_unused_result))
+static __attribute__((warn_unused_result))
 dberr_t
 fil_write_lsn_and_arch_no_to_file(
 /*==============================*/
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
@@ -814,7 +814,7 @@ ulint
 dict_tf_get_format(
 /*===============*/
 	ulint		flags)		/*!< in: dict_table_t::flags */
-	__attribute__((nonnull, warn_unused_result));
+	__attribute__((warn_unused_result));
 /********************************************************************//**
 Set the various values in a dict_table_t::flags pointer. */
 UNIV_INLINE
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
@@ -333,8 +333,7 @@ dberr_t
 fil_write_flushed_lsn_to_data_files(
 /*================================*/
 	lsn_t	lsn,		/*!< in: lsn to write */
-	ulint	arch_log_no)	/*!< in: latest archived log file number */
-	__attribute__((nonnull));
+	ulint	arch_log_no);	/*!< in: latest archived log file number */
 /*******************************************************************//**
 Reads the flushed lsn, arch no, and tablespace flag fields from a data
 file at database startup. */
diff --git a/storage/innobase/include/fts0priv.ic b/storage/innobase/include/fts0priv.ic
@@ -57,3 +57,42 @@ fts_read_object_id(
 	return(sscanf(str, IB_ID_FMT, id) == 2);
 }
 
+/******************************************************************//**
+Compare two fts_trx_table_t instances.
+@return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2  */
+UNIV_INLINE
+int
+fts_trx_table_cmp(
+/*==============*/
+	const void*	p1,			/*!< in: id1 */
+	const void*	p2)			/*!< in: id2 */
+{
+	const dict_table_t* table1 = (*(const fts_trx_table_t**) p1)->table;
+	const dict_table_t* table2 = (*(const fts_trx_table_t**) p2)->table;
+
+	return((table1->id > table2->id)
+	       ? 1
+	       : (table1->id == table2->id)
+		  ? 0
+		  : -1);
+}
+
+/******************************************************************//**
+Compare a table id with a fts_trx_table_t table id.
+@return < 0 if n1 < n2, 0 if n1 == n2,> 0 if n1 > n2 */
+UNIV_INLINE
+int
+fts_trx_table_id_cmp(
+/*=================*/
+	const void*	p1,			/*!< in: id1 */
+	const void*	p2)			/*!< in: id2 */
+{
+	const ullint* table_id = (const ullint*) p1;
+	const dict_table_t* table2 = (*(const fts_trx_table_t**) p2)->table;
+
+	return((*table_id > table2->id)
+	       ? 1
+	       : (*table_id == table2->id)
+		  ? 0
+		  : -1);
+}
diff --git a/storage/innobase/include/fts0types.ic b/storage/innobase/include/fts0types.ic
@@ -36,46 +36,6 @@ extern const ulint UTF8_ERROR;
 /* Determine if a UTF-8 continuation byte is valid. */
 #define fts_utf8_is_valid(b) (((b) & 0xC0) == 0x80)
 
-/******************************************************************//**
-Compare two fts_trx_table_t instances.
-@return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2  */
-UNIV_INLINE
-int
-fts_trx_table_cmp(
-/*==============*/
-	const void*	p1,			/*!< in: id1 */
-	const void*	p2)			/*!< in: id2 */
-{
-	const dict_table_t* table1 = (*(const fts_trx_table_t**) p1)->table;
-	const dict_table_t* table2 = (*(const fts_trx_table_t**) p2)->table;
-
-	return((table1->id > table2->id)
-	       ? 1
-	       : (table1->id == table2->id)
-		  ? 0
-		  : -1);
-}
-
-/******************************************************************//**
-Compare a table id with a fts_trx_table_t table id.
-@return < 0 if n1 < n2, 0 if n1 == n2,> 0 if n1 > n2 */
-UNIV_INLINE
-int
-fts_trx_table_id_cmp(
-/*=================*/
-	const void*	p1,			/*!< in: id1 */
-	const void*	p2)			/*!< in: id2 */
-{
-	const ullint* table_id = (const ullint*) p1;
-	const dict_table_t* table2 = (*(const fts_trx_table_t**) p2)->table;
-
-	return((*table_id > table2->id)
-	       ? 1
-	       : (*table_id == table2->id)
-		  ? 0
-		  : -1);
-}
-
 /******************************************************************//**
 Duplicate an UTF-8 string.
 @return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
diff --git a/unittest/gunit/decimal-t.cc b/unittest/gunit/decimal-t.cc
@@ -420,8 +420,10 @@ void do_test_pr(const char *s1, int prec, int dec, char filler,
   int slen= sizeof(s2);
   int res;
 
-  sprintf(s, filler ? "'%s', %d, %d, '%c'" : "'%s', %d, %d, '\\0'",
-          s1, prec, dec, filler);
+  if (filler)
+    sprintf(s, "'%s', %d, %d, '%c'", s1, prec, dec, filler);
+  else
+    sprintf(s, "'%s', %d, %d, '\\0'", s1, prec, dec);
   end= strend(s1);
   string2decimal(s1, &a, &end);
   res= decimal2string(&a, s2, &slen, prec, dec, filler);
diff --git a/unittest/gunit/dynarray-t.cc b/unittest/gunit/dynarray-t.cc
@@ -83,6 +83,19 @@ static inline bool operator==(const Key_use &lhs, const Key_use &rhs)
 }
 
 
+static inline std::ostream &operator<<(std::ostream &s, const Key_use &v)
+{
+  return s << "{"
+           << v.table->tablenr << ", "
+           << v.key            << ", "
+           << v.keypart        << ", "
+           << v.used_tables    << ", "
+           << v.optimize
+           << "}"
+    ;
+}
+
+
 namespace {
 
 /*
@@ -108,19 +121,6 @@ inline int sort_keyuse(Key_use *a, Key_use *b)
 }
 
 
-std::ostream &operator<<(std::ostream &s, const Key_use &v)
-{
-  return s << "{"
-           << v.table->tablenr << ", "
-           << v.key            << ", "
-           << v.keypart        << ", "
-           << v.used_tables    << ", "
-           << v.optimize
-           << "}"
-    ;
-}
-
-
 // We generate some random data at startup, for testing of sorting.
 void generate_test_data(Key_use *keys, TABLE *tables, int n)
 {

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,8 @@ static MYSQL_RES * emb_store_result(MYSQL *mysql)`
`448`	`448`	`int emb_read_change_user_result(MYSQL *mysql)`
`449`	`449`	`{`
`450`	`450`	`mysql->net.read_pos= (uchar*)""; // fake an OK packet`
`451`		`- return mysql_errno(mysql) ? packet_error : 1 /* length of the OK packet */;`
	`451`	`+ return mysql_errno(mysql) ? static_cast<int>packet_error :`
	`452`	`+ 1 /* length of the OK packet */;`
`452`	`453`	`}`
`453`	`454`
`454`	`455`	`MYSQL_METHODS embedded_methods=`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ bool Cached_item_int::cmp(void)`
`129`	`129`	`{`
`130`	`130`	`DBUG_ENTER("Cached_item_int::cmp");`
`131`	`131`	`longlong nr=item->val_int();`
`132`		`- DBUG_PRINT("info", ("old: %Ld, new: %Ld", value, nr));`
	`132`	`+ DBUG_PRINT("info", ("old: %lld, new: %lld", value, nr));`
`133`	`133`	`if (null_value != item->null_value \|\| nr != value)`
`134`	`134`	`{`
`135`	`135`	`null_value= item->null_value;`
Original file line number	Diff line number	Diff line change
`@@ -1423,7 +1423,7 @@ static int find_uniq_filename(char *name)`
`1423`	`1423`	`my_dirend(dir_info);`
`1424`	`1424`
`1425`	`1425`	`/* check if reached the maximum possible extension number */`
`1426`		`- if ((max_found == MAX_LOG_UNIQUE_FN_EXT))`
	`1426`	`+ if (max_found == MAX_LOG_UNIQUE_FN_EXT)`
`1427`	`1427`	`{`
`1428`	`1428`	`sql_print_error("Log filename extension number exhausted: %06lu. \`
`1429`	`1429`	`Please fix this by archiving old logs and \`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ static ulonglong get_exact_record_count(TABLE_LIST *tables)`
`81`	`81`	`for (TABLE_LIST *tl= tables; tl; tl= tl->next_leaf)`
`82`	`82`	`{`
`83`	`83`	`ha_rows tmp= tl->table->file->records();`
`84`		`- if ((tmp == HA_POS_ERROR))`
	`84`	`+ if (tmp == HA_POS_ERROR)`
`85`	`85`	`return ULONGLONG_MAX;`
`86`	`86`	`count*= tmp;`
`87`	`87`	`}`