summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2003-09-16 15:23:38 +0200
committerunknown <serg@sergbook.mysql.com>2003-09-16 15:23:38 +0200
commitb89a17dd5d1a3b4bfc71ae2af1bededf7afb3781 (patch)
tree5ab8c199a76ef3c34831cb2a2285497ae48f71d0
parent49baac8d4f0d7b66565989c57104ceb20240261c (diff)
downloadmariadb-git-b89a17dd5d1a3b4bfc71ae2af1bededf7afb3781.tar.gz
minor cleanups
heap/hp_info.c: flag in not really unused here :) sql/item_timefunc.cc: unnecessary "typedef" keyword removed (VC++ warning)
-rw-r--r--heap/hp_info.c3
-rw-r--r--sql/item_timefunc.cc6
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;