Commit b44f11c9 authored by Alexander Barkov's avatar Alexander Barkov

Fixing compilation failure in Solaris/OpenSolaris

error: too many initializers for `tm'

modified:
  storage/connect/ha_connect.cc
parent 7329f853
...@@ -949,13 +949,12 @@ void *ha_connect::GetColumnOption(void *field, PCOLINFO pcf) ...@@ -949,13 +949,12 @@ void *ha_connect::GetColumnOption(void *field, PCOLINFO pcf)
// Find the (max) length produced by the date format // Find the (max) length produced by the date format
char buf[256]; char buf[256];
PGLOBAL g= GetPlug(table->in_use, xp); PGLOBAL g= GetPlug(table->in_use, xp);
#if defined(WIN32)
struct tm datm= {0,0,0,12,11,112,0,0,0};
#else // !WIN32
struct tm datm= {0,0,0,12,11,112,0,0,0,0,0};
#endif // !WIN32
PDTP pdtp= MakeDateFormat(g, pcf->Datefmt, false, true, 0); PDTP pdtp= MakeDateFormat(g, pcf->Datefmt, false, true, 0);
struct tm datm;
bzero(&datm, sizeof(datm));
datm.tm_mday= 12;
datm.tm_mon= 11;
datm.tm_year= 112;
len= strftime(buf, 256, pdtp->OutFmt, &datm); len= strftime(buf, 256, pdtp->OutFmt, &datm);
} else } else
len= 0; len= 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment