diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-08-17 12:05:34 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-08-17 12:05:34 +0400 |
| commit | 62c3acac18d629152113aa27f80f4abf98a742ea (patch) | |
| tree | c51b100db6c8440980d746e171359286019257f6 /sql | |
| parent | a7a508e14fa4539f28591050d95f70295dd904f9 (diff) | |
| download | mariadb-git-62c3acac18d629152113aa27f80f4abf98a742ea.tar.gz | |
Portablity fix.
hpux11 compiler dislikes empty array initializers.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_timefunc.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 73aec7e8bdd..5d9a6dd9490 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -113,10 +113,15 @@ static bool make_datetime(date_time_format_types format, TIME *ltime, } -/* Date formats corresponding to compound %r and %T conversion specifiers */ -static DATE_TIME_FORMAT time_ampm_format= {{}, '\0', 0, +/* + Date formats corresponding to compound %r and %T conversion specifiers + + Note: We should init at least first element of "positions" array + (first member) or hpux11 compiler will die horribly. +*/ +static DATE_TIME_FORMAT time_ampm_format= {{0}, '\0', 0, {(char *)"%I:%i:%S %p", 11}}; -static DATE_TIME_FORMAT time_24hrs_format= {{}, '\0', 0, +static DATE_TIME_FORMAT time_24hrs_format= {{0}, '\0', 0, {(char *)"%H:%i:%S", 8}}; /* |