diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2019-04-25 20:11:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 20:11:37 +0900 |
| commit | 80e8fee90732c4cf2436dde5d02f4edc7824f06b (patch) | |
| tree | 7d9d5df2ca140335905c6e8e2e24fb28e90a7d63 /storage/connect/value.cpp | |
| parent | ebf3376677f9803a914cadc034c71ec2881f9eb4 (diff) | |
| parent | ca7fbcea6c4fe13c295cf43b80d05351aba59e95 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-18995.tar.gz | |
Merge branch '10.4' into bb-10.4-MDEV-18995bb-10.4-MDEV-18995
Diffstat (limited to 'storage/connect/value.cpp')
| -rw-r--r-- | storage/connect/value.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp index e159efaa989..ac1a67e3ca7 100644 --- a/storage/connect/value.cpp +++ b/storage/connect/value.cpp @@ -2599,12 +2599,13 @@ bool DTVAL::MakeDate(PGLOBAL g, int *val, int nval) // Pass g to have an error return or NULL to set invalid dates to 0 if (MakeTime(&datm)) + { if (g) { strcpy(g->Message, MSG(BAD_DATETIME)); rc = true; } else Tval = 0; - + } return rc; } // end of MakeDate |