diff options
| -rw-r--r-- | heap/hp_info.c | 3 | ||||
| -rw-r--r-- | sql/item_timefunc.cc | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/heap/hp_info.c b/heap/hp_info.c index 3122a665fac..e10d140e1f6 100644 --- 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 flag __attribute__((unused))) +int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag ) { DBUG_ENTER("heap_info"); x->records = info->s->records; diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 31ce2ad9cdc..9a36f8a60a6 100644 --- a/sql/item_timefunc.cc +++ b/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; |