diff options
| author | kevg <claprix@yandex.ru> | 2016-11-24 17:36:02 +0300 |
|---|---|---|
| committer | kevg <claprix@yandex.ru> | 2016-11-24 17:36:02 +0300 |
| commit | 780db8e25239e5423cfab50c04c60b79ebc0224b (patch) | |
| tree | 2c73735c76607093d466a143627efdd8b4fbc2ca /storage/connect | |
| parent | f4d6f26a4fae3f0cfcc6e77667c7697c4e024189 (diff) | |
| download | mariadb-git-780db8e25239e5423cfab50c04c60b79ebc0224b.tar.gz | |
fix build and some warnings
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/ha_connect.cc | 6 | ||||
| -rw-r--r-- | storage/connect/inihandl.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 5fe75fd0f59..a2ba6ffad13 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -1190,7 +1190,7 @@ char *ha_connect::GetRealString(const char *s) { char *sv; - if (IsPartitioned() && s && partname && *partname) { + if (IsPartitioned() && s && *partname) { sv= (char*)PlugSubAlloc(xp->g, NULL, 0); sprintf(sv, s, partname); PlugSubAlloc(xp->g, NULL, strlen(sv) + 1); @@ -2868,7 +2868,7 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond) strncat(body, res->ptr(), res->length()); if (res->length() < 19) - strcat(body, "1970-01-01 00:00:00" + res->length()); + strcat(body, &"1970-01-01 00:00:00"[res->length()]); strcat(body, "'}"); break; @@ -2897,7 +2897,7 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond) strncat(body, res->ptr(), res->length()); if (res->length() < 19) - strcat(body, "1970-01-01 00:00:00" + res->length()); + strcat(body, &"1970-01-01 00:00:00"[res->length()]); strcat(body, "'}"); break; diff --git a/storage/connect/inihandl.c b/storage/connect/inihandl.c index 46102557b20..896431b855f 100644 --- a/storage/connect/inihandl.c +++ b/storage/connect/inihandl.c @@ -193,7 +193,7 @@ static void PROFILE_Save( FILE *file, PROFILESECTION *section ) } for (key = section->key; key; key = key->next) - if (key->name && key->name[0]) { + if (key->name[0]) { fprintf(file, "%s", SVP(key->name)); if (key->value) |