database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
unknown
2003-09-18 14:38:14 +02:00
parent cbc431dbdf b89a17dd5d
commit 3d52d94e02
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
heap/hp_info.c
View File

@@ -44,8 +44,7 @@ ulong heap_position_old(HP_INFO *info)
/* Note that heap_info does NOT return information about the /* Note that heap_info does NOT return information about the
current position anymore; Use heap_position instead */ 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"); DBUG_ENTER("heap_info");
x->records = info->s->records; x->records = info->s->records;

6
sql/item_timefunc.cc
View File

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