Merge

heap/hp_info.c

@@ -44,8 +44,7 @@ ulong heap_position_old(HP_INFO *info)
 /* Note that heap_info does NOT return information about the
    current position anymore;  Use heap_position instead */
 
-int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x,
-	      int flag __attribute__((unused)))
+int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag )
 {
   DBUG_ENTER("heap_info");
   x->records	 = info->s->records;

sql/item_timefunc.cc

@@ -57,13 +57,13 @@ static String day_names[] =
   String("Sunday",	&my_charset_latin1)
 };
 
-enum date_time_format_types 
-{ 
+enum date_time_format_types
+{
   TIME_ONLY= 0, TIME_MICROSECOND,
   DATE_ONLY, DATE_TIME, DATE_TIME_MICROSECOND
 };
 
-typedef struct date_time_format 
+struct date_time_format
 {
   const char* format_str;
   uint length;