diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:10:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:10:03 +0300 |
| commit | 2a93e632b1676b6df3dde150888d6428a57f8399 (patch) | |
| tree | f9eac87b11d4e4666e50ac865aa82cac6f50a852 /sql/mysqld.cc | |
| parent | 9aea50616c2d8e067e5ce3efb1152e81877bf931 (diff) | |
| parent | 94a520ddbe39ae97de1135d98699cf2674e6b77e (diff) | |
| download | mariadb-git-2a93e632b1676b6df3dde150888d6428a57f8399.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a0379b0e2a3..4516e8ff596 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4080,7 +4080,8 @@ rpl_make_log_name(const char *opt, const char *ext) { DBUG_ENTER("rpl_make_log_name"); - DBUG_PRINT("enter", ("opt: %s, def: %s, ext: %s", opt, def, ext)); + DBUG_PRINT("enter", ("opt: %s, def: %s, ext: %s", opt ? opt : "(null)", + def, ext)); char buff[FN_REFLEN]; const char *base= opt ? opt : def; unsigned int options= |