mirror of
https://github.com/MariaDB/server.git
synced 2025-11-18 07:48:43 +03:00
Merge
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user