Merge

e507fcec · serg@serg.mylan · aa7fd6f4 · 60370dd0 · e507fcec · e507fcec
Commit e507fcec authored Sep 18, 2003 by serg@serg.mylan
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

heap/hp_info.c heap/hp_info.c +1 -2

sql/item_timefunc.cc sql/item_timefunc.cc +3 -3

No files found.
--- a/heap/hp_info.c
+++ b/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 heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag )
-	      int flag __attribute__((unused)))
 {
  DBUG_ENTER("heap_info");
  x->records	 = info->s->records;

--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -63,7 +63,7 @@ enum date_time_format_types
  DATE_ONLY, DATE_TIME, DATE_TIME_MICROSECOND
 };
-typedef struct date_time_format 
+struct date_time_format
 {
  const char* format_str;
  uint length;