diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 11:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 12:02:23 +0200 |
| commit | 0aa9b03393f515d7b07c3139756c2a9270501c97 (patch) | |
| tree | 074514d29d2db5045db04fb838506b3eb5d456e9 /sql/mysqld.cc | |
| parent | 655cba619d2e6556d4a7c6a3b9127f248bb8e5a0 (diff) | |
| parent | 4cbf77e16ef9324acf85c01bc63023d62b821752 (diff) | |
| download | mariadb-git-0aa9b03393f515d7b07c3139756c2a9270501c97.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e689087e1f8..1a3ff53be6f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8321,7 +8321,7 @@ my_asn1_time_to_string(const ASN1_TIME *time, char *buf, size_t len) if (bio == NULL) return NULL; - if (!ASN1_TIME_print(bio, time)) + if (!ASN1_TIME_print(bio, const_cast<ASN1_TIME*>(time))) goto end; n_read= BIO_read(bio, buf, (int) (len - 1)); |