diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d621a3be1cd..9b972a9af5e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8142,14 +8142,13 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument) return 1; #endif - SYSVAR_AUTOSIZE(pidfile_name_ptr, pidfile_name); - /* PID file */ - strmake(pidfile_name, argument, sizeof(pidfile_name)-5); - strmov(fn_ext(pidfile_name),".pid"); - - /* check for errors */ - if (!pidfile_name_ptr) - return 1; // out of memory error + if (IS_SYSVAR_AUTOSIZE(&pidfile_name_ptr)) + { + SYSVAR_AUTOSIZE(pidfile_name_ptr, pidfile_name); + /* PID file */ + strmake(pidfile_name, argument, sizeof(pidfile_name)-5); + strmov(fn_ext(pidfile_name),".pid"); + } break; } #ifdef HAVE_REPLICATION |